!2 skyeye can compile successfully

Framework/Common/SpDefine.h

@@ -11,21 +11,25 @@ public:
 	static constexpr const char*  tokenSecret = "eca829c78067c686561bd844129321c8a78af3";
 	static constexpr const char*  CommonLaunchUrl = "https://rvc-gateway.paasst.cmbchina.cn";
 	static constexpr const char*  CenterConfigTotal = "https://accessproxy-service.paasst.cmbchina.cn/centerconfig";
+	static constexpr const char* endpoint_env = "https://kafkaproxy.paasst.cmbchina.cn/api/kafka/log/send";
 #elif defined(DEVOPS_ON_UAT)/*DevOps流水线编译，UAT环境*/
 	static constexpr const char*  channelId = "7eb748cb71744c87b5c126e05af8cce7";
 	static constexpr const char*  tokenSecret = "eca529c78967c640561bd844229391c8a78af3";
 	static constexpr const char*  CommonLaunchUrl = "https://rvc-gateway.paasuat.cmbchina.cn";
 	static constexpr const char*  CenterConfigTotal = "https://accessproxy-service.paasuat.cmbchina.cn/centerconfig";
+	static constexpr const char* endpoint_env = "https://kafkaproxy.paasuat.cmbchina.cn/api/kafka/log/send";
 #elif defined(DEVOPS_ON_PRD)/*DevOps流水线编译，PRD环境*/
 	static constexpr const char*  channelId = "572f7577fa9f425c8475a8d77db4ae31";
 	static constexpr const char*  tokenSecret = "eca129c78767c670561bd844629361c8a78af3";
 	static constexpr const char*  CommonLaunchUrl = "https://rvc-gateway.paas.cmbchina.cn";
 	static constexpr const char*  CenterConfigTotal = "https://accessproxy-service.paas.cmbchina.cn/centerconfig";
+	static constexpr const char* endpoint_env = "https://kafkaproxy.paas.cmbchina.cn/api/kafka/log/send";
 #else/*本地编译等非DevOps环境编译的版本*/
 	static constexpr const char*  channelId = "5fdd82e3b90a4de69f9da4738e5f1216";
 	static constexpr const char*  tokenSecret = "eca829c78067c686561bd844129321c8a78af3";
 	static constexpr const char*  CommonLaunchUrl = "https://rvc-gateway.paasst.cmbchina.cn";
 	static constexpr const char*  CenterConfigTotal = "https://accessproxy-service.paasst.cmbchina.cn/centerconfig";
+	static constexpr const char* endpoint_env = "https://kafkaproxy.paasst.cmbchina.cn/api/kafka/log/send";
 #endif
 
 	//default endpoint and topic
@@ -40,5 +44,8 @@ public:
 	//const log params
 	static constexpr const char* cmptId = "LR04";
 	static constexpr const char* CmptName = "FrameworkLib";
+	static constexpr const char* deployUnitId = "LR04.02@FrameworkLib_PRD_PRD";
+	static constexpr const char* serviceUnitId = "LR04.02_FrameworkLib";
+
 
 };

Other/libpublicFun/CMakeLists.txt

@@ -58,7 +58,7 @@ target_compile_definitions(${MODULE_NAME} PUBLIC "LIBPUBLIC_EXPORTS")
 target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_BOOST} ${CONAN_LIB_DIRS_JSONCPP})
 
 # 添加需要依赖的其他共享库（包括系统库）
-target_link_libraries(${MODULE_NAME} CONAN_PKG::OpenSSL ${Boost_LIBRARIES} RestfulFunc ${CONAN_LIBS_JSONCPP})
+target_link_libraries(${MODULE_NAME} CONAN_PKG::OpenSSL ${Boost_LIBRARIES} RestfulFunc ${CONAN_PKG_LIBS_JSONCPP})
 
 deploy_others(${MODULE_PREFIX} ${MODULE_NAME})
 

Other/libpublicFun/skyeyeLog/skyeyeLog.cpp

@@ -6,6 +6,7 @@
 #include <mutex>
 #include "uuid4.h"
 #include "SpDefine.h"
+#include <cstdarg>
 
 #define MAX_LOG_LEN 1900
 void skyeye_GetToken(char* channelId, char* token, char* terminalno, char* reserve1);
@@ -301,99 +302,160 @@ skyeye_logger& skyeye_logger::getDefaultLogger()
 {
 	// TODO: 在此处插入 return 语句
 	static skyeye_logger cur;
+	if (cur.m_msg == nullptr)
+		cur.m_msg = new Link_private(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM);
+	else
+	{
+		delete cur.m_msg;
+		cur.m_msg = new Link_private(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM);
+	}
 	return cur;
 }
 
 skyeye_logger& skyeye_logger::setLogLevel(LOG_LEVEL_E t_level)
 {
 	// TODO: 在此处插入 return 语句
+	if (m_msg != nullptr)
+		m_msg->Level = t_level;
 	return *this;
 }
 
 skyeye_logger& skyeye_logger::setLogType(LOG_TYPE_E t_type)
 {
 	// TODO: 在此处插入 return 语句
+	if (m_msg != nullptr)
+		m_msg->Type = t_type;
 	return *this;
 }
 
 skyeye_logger& skyeye_logger::setResultCode(std::string t_ResultCode)
 {
 	// TODO: 在此处插入 return 语句
+	if (m_msg != nullptr)
+		m_msg->ResultCode = t_ResultCode;
 	return *this;
 }
 
 skyeye_logger& skyeye_logger::setTraceID(std::string t_TraceID)
 {
 	// TODO: 在此处插入 return 语句
+	if (m_msg != nullptr)
+		m_msg->TraceID = t_TraceID;
 	return *this;
 }
 
 skyeye_logger& skyeye_logger::setResultMsg(std::string t_ResultMsg)
 {
 	// TODO: 在此处插入 return 语句
+	if (m_msg != nullptr)
+		m_msg->ResultMsg = t_ResultMsg;
 	return *this;
 }
 
 skyeye_logger& skyeye_logger::setLogCode(std::string t_LogCode)
 {
 	// TODO: 在此处插入 return 语句
+	if (m_msg != nullptr)
+		m_msg->LogCode = t_LogCode;
 	return *this;
 }
 
 skyeye_logger& skyeye_logger::setAPI(std::string t_API)
 {
 	// TODO: 在此处插入 return 语句
+	if (m_msg != nullptr)
+		m_msg->API = t_API;
 	return *this;
 }
 
 skyeye_logger& skyeye_logger::setBussID(std::string t_BussID)
 {
 	// TODO: 在此处插入 return 语句
+	if (m_msg != nullptr)
+		m_msg->BussID = t_BussID;
 	return *this;
 }
 
 skyeye_logger& skyeye_logger::setTipMsg(std::string t_TipMsg)
 {
 	// TODO: 在此处插入 return 语句
+	if (m_msg != nullptr)
+		m_msg->TipMsg = t_TipMsg;
 	return *this;
 }
 
 skyeye_logger& skyeye_logger::setSourceType(std::string t_SourceType)
 {
 	// TODO: 在此处插入 return 语句
+	if (m_msg != nullptr)
+		m_msg->SourceType = t_SourceType;
 	return *this;
 }
 
 skyeye_logger& skyeye_logger::setBeginTime(long t_BeginTime)
 {
 	// TODO: 在此处插入 return 语句
+	if (m_msg != nullptr)
+		m_msg->BeginTime = t_BeginTime;
 	return *this;
 }
 
 skyeye_logger& skyeye_logger::setEndTime(long t_EndTime)
 {
 	// TODO: 在此处插入 return 语句
+	if (m_msg != nullptr)
+		m_msg->EndTime = t_EndTime;
 	return *this;
 }
 
 skyeye_logger& skyeye_logger::setCostTime(long t_costTime)
 {
 	// TODO: 在此处插入 return 语句
+	if (m_msg != nullptr)
+		m_msg->CostTime = t_costTime;
 	return *this;
 }
 
 skyeye_logger& skyeye_logger::setVtmCode(std::string t_VtmCode)
 {
 	// TODO: 在此处插入 return 语句
+	if (m_msg != nullptr)
+		m_msg->VtmCode = t_VtmCode;
 	return *this;
 }
 
-void skyeye_logger::operator()(LOG_LEVEL_E t_level, LOG_TYPE_E t_type, const char* str, ...) const
+void skyeye_logger::operator()(LOG_LEVEL_E t_level, LOG_TYPE_E t_type, const char* str, ...)
 {
-}
+	if (m_msg != nullptr)
+	{
+		if (str == nullptr)
+			return;
+
+		va_list arg;
+		va_start(arg, str);
+
+		int n = _vscprintf(str, arg) + 1;
+		if (n > MAX_LOG_LEN) {
+			n = MAX_LOG_LEN;
+		}
+
+		std::vector<char> buf(n + 1, '\0');
+		vsnprintf(&buf[0], n, str, arg);
+		va_end(arg);
+
+
+
+		m_msg->Level = t_level;
+		m_msg->Type = t_type;
+		m_msg->ResultMsg = &buf[0];
+
+		skyeye_sender::getInstance().LogToSender(m_msg);
+
+		delete m_msg;
+		m_msg = nullptr;
+	}
+
 
-void skyeye_logger::operator()() const
-{
 }
 
 void CreateDefaultLogger(std::string logEndpoint, std::string logTopic,std::string tokenEndpoint, std::string channelId, std::string tokenSecret, Link_const constParam)
@@ -410,5 +472,13 @@ void CreateDefaultLogger(std::string terminalno, std::string version, std::strin
 	constParam.m_item = itemId;
 	constParam.m_terminalNo = terminalno;
 	constParam.m_version = version;
-	constParam.m_cmptId
+	constParam.m_cmptId = SpDefine::cmptId;
+	constParam.m_cmptName = SpDefine::CmptName;
+	constParam.m_serviceUnitId = SpDefine::serviceUnitId;
+	constParam.m_deployUnitId = SpDefine::deployUnitId;
+
+	skyeye_logger::getDefaultLogger().m_constParam = constParam;
+	TokenManager::getInstance().InitTokenManager(30, SpDefine::CenterConfigTotal, SpDefine::channelId, SpDefine::tokenSecret, constParam.m_terminalNo, constParam.m_version);
+	skyeye_sender::getInstance().InitSender(SpDefine::endpoint_env, SpDefine::topicSys);
+
 }

Other/libpublicFun/skyeyeLog/skyeyeLog.h

@@ -82,6 +82,7 @@ public:
 	std::string m_cmptId;
 	std::string m_cmptName;
 	std::string m_serviceUnitId;
+	std::string m_deployUnitId;
 	std::string m_version;
 };
 
@@ -112,8 +113,7 @@ public:
 	skyeye_logger& setEndTime(long t_EndTime);//用户日志必填， 响应接收 / 应答时间
 	skyeye_logger& setCostTime(long t_costTime);//消耗时间，自定义字段,单位ms
 	skyeye_logger& setVtmCode(std::string t_VtmCode);//VtmCode,记录原告警
-	void operator () (LOG_LEVEL_E t_level, LOG_TYPE_E t_type, const char* str, ...) const;
-	void operator () ()  const;
+	void operator () (LOG_LEVEL_E t_level, LOG_TYPE_E t_type, const char* str, ...);
 private:
 	Link_private* m_msg;
 public: