浏览代码

Z991239-5263 #comment 下线interactivelog实体

80274480 1 年之前
父节点
当前提交
d9491e141f

+ 2 - 2
Module/CMakeLists.txt

@@ -186,7 +186,7 @@ add_subdirectory(mod_CenterSetting)
 add_subdirectory(mod_tokenmgr)
 add_subdirectory(mod_evtconverter)
 #zhaohu
-add_subdirectory(mod_interactivelog)
+#add_subdirectory(mod_interactivelog)
 add_subdirectory(mod_chromium)
 
 add_subdirectory(mod_ScannerSet)
@@ -248,7 +248,7 @@ add_subdirectory(mod_guiconsole)
 add_subdirectory(mod_CenterSetting)
 add_subdirectory(mod_tokenmgr)
 add_subdirectory(mod_evtconverter)
-add_subdirectory(mod_interactivelog)
+#add_subdirectory(mod_interactivelog)
 add_subdirectory(mod_chromium)
 
 add_subdirectory(mod_ScannerSet)

+ 0 - 21
Module/mod_interactivelog/CMakeLists.txt

@@ -1,21 +0,0 @@
-define_module("interactivelog")
-
-set(${MODULE_PREFIX}_SRCS
-	Event.h
-	bizlog.h
-	bizlog.cpp
-	mod_interactivelog.cpp
-	)
-
-set(MOD_VERSION_STRING "0.0.1-dev1")
-add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
-
-target_include_directories(${MODULE_NAME} PRIVATE
-	${RVC_TOOLKIT_INCLUDE_DIR}
-)
-
-# 添加实体需要依赖的其他共享库(包括系统库)
-set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_LIBS} ${RVCCOMM_LIB})
-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} CONAN_PKG::OpenSSL)
-
-deploy_module(${MODULE_PREFIX} ${MODULE_NAME})

+ 0 - 2
Module/mod_interactivelog/ChangeLog

@@ -1,2 +0,0 @@
-
-* 2020-7-3 调通与分行服务进行通信的功能,双活机制中用到

+ 0 - 1
Module/mod_interactivelog/Event.h

@@ -1 +0,0 @@
-#pragma once

+ 0 - 54
Module/mod_interactivelog/InteractiveLog.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="gb2312" ?>
-<entity name="InteractiveLog">
-	<class name="LogService" overlap="true" exclusive="false">
-		<oneway name="LogFunction"  overlap="true">
-			<param name="nam" type="wstring"/>
-			<param name="display" type="wstring"/>
-			<param name="product" type="wstring"/>
-			<param name="service_code" type="wstring"/>
-			<param name="action_id" type="int"/>
-		</oneway>
-		<oneway name="LogCustomerID"  overlap="true">
-			<param name="customer_id" type="wstring"/>
-			<param name="verify_method" type="wstring"/>
-			<param name="level" type="int"/>
-			<param name="action_id" type="int"/>
-		</oneway>
-		<oneway name="LogAgreement"  overlap="true">
-			<param name="content" type="wstring"/>
-			<param name="action_id" type="int"/>
-		</oneway>
-		<oneway name="LogReceipt"  overlap="true">
-			<param name="content" type="wstring"/>
-			<param name="action_id" type="int"/>
-		</oneway>
-		<oneway name="LogOperation"  overlap="true">
-			<param name="code" type="wstring"/>
-			<param name="content" type="wstring"/>
-			<param name="action_id" type="int"/>
-		</oneway>
-		<oneway name="LogResponse"  overlap="true">
-			<param name="code" type="wstring"/>
-			<param name="content" type="wstring"/>
-			<param name="action_id" type="int"/>
-		</oneway>
-		<oneway name="LogAgent"  overlap="true">
-			<param name="code" type="wstring"/>
-			<param name="content" type="wstring"/>
-			<param name="action_id" type="int"/>
-		</oneway>
-		<oneway name="LogBegin"  overlap="true">
-			<param name="session_id" type="wstring"/>
-			<param name="session_count" type="int"/>
-		</oneway>
-		<oneway name="LogEnd"  overlap="true">
-			<param name="session_id" type="wstring"/>
-		</oneway>
-		<oneway name="LogCallID"  overlap="true">
-			<param name="call_id" type="wstring"/>
-			<param name="workNumber" type="wstring"/>
-			<param name="skillCode" type="wstring"/>
-			<param name="action_id" type="int"/>			
-		</oneway>
-	</class>
-</entity>

+ 0 - 231
Module/mod_interactivelog/InteractiveLog_client_g.h

@@ -1,231 +0,0 @@
-
-#ifndef __INTERACTIVELOG_CLIENT_G_H
-#define __INTERACTIVELOG_CLIENT_G_H
-
-#pragma once
-
-// This code is generated by spgen tool!
-
-#include "InteractiveLog_def_g.h"
-
-namespace InteractiveLog {
-class LogService_ClientBase : public CClientSessionBase {
-public:
-	explicit LogService_ClientBase(CEntityBase *pEntity) : m_pEntityBase(pEntity), m_bSysManaged(false) {}
-
-	LogService_ClientBase* operator () (const linkContext &curLink) 
-	{
-		m_context = curLink;
-		return this;
-	}
-
-protected:
-	virtual ~LogService_ClientBase()
-	{
-		/// override by user
-	}
-public:
-
-	void OnConnectSucceed()
-	{
-		bSessionClosed = false;
-	}
-	void OnClose(ErrorCodeEnum)
-	{
-		Dbg("session closed.");
-		bSessionClosed = true;
-	}
-	bool QuerySessionClosed()
-	{
-		return bSessionClosed;
-	}
-	ErrorCodeEnum Connect(CSmartPointer<IAsynWaitSp> &spAsyncWait)
-	{
-		CSmartPointer<IEntityFunction> pFunc = m_pEntityBase->GetFunction();
-		ErrorCodeEnum Error = pFunc->ConnectRemoteEntity(this, "InteractiveLog", "LogService", spAsyncWait);
-		if (Error == Error_Succeed) {
-			m_bSysManaged = true;
-			bSessionClosed = false;
-		}
-		return Error;
-	}
-	ErrorCodeEnum Connect()
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = Connect(spAsyncWait);
-		if (Error == Error_Succeed) {
-			Error = spAsyncWait->WaitAnswer();
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum LogFunction(LogService_LogFunction_Info &Info)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		CAutoBuffer Buf = SpObject2Buffer(Info);
-		auto ret = pFunc->OnewayCall(LogService_Method_LogFunction, LogService_MethodSignature_LogFunction, Buf, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-	ErrorCodeEnum LogCustomerID(LogService_LogCustomerID_Info &Info)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		CAutoBuffer Buf = SpObject2Buffer(Info);
-		auto ret = pFunc->OnewayCall(LogService_Method_LogCustomerID, LogService_MethodSignature_LogCustomerID, Buf, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-	ErrorCodeEnum LogAgreement(LogService_LogAgreement_Info &Info)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		CAutoBuffer Buf = SpObject2Buffer(Info);
-		auto ret = pFunc->OnewayCall(LogService_Method_LogAgreement, LogService_MethodSignature_LogAgreement, Buf, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-	ErrorCodeEnum LogReceipt(LogService_LogReceipt_Info &Info)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		CAutoBuffer Buf = SpObject2Buffer(Info);
-		auto ret = pFunc->OnewayCall(LogService_Method_LogReceipt, LogService_MethodSignature_LogReceipt, Buf, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-	ErrorCodeEnum LogOperation(LogService_LogOperation_Info &Info)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		CAutoBuffer Buf = SpObject2Buffer(Info);
-		auto ret = pFunc->OnewayCall(LogService_Method_LogOperation, LogService_MethodSignature_LogOperation, Buf, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-	ErrorCodeEnum LogResponse(LogService_LogResponse_Info &Info)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		CAutoBuffer Buf = SpObject2Buffer(Info);
-		auto ret = pFunc->OnewayCall(LogService_Method_LogResponse, LogService_MethodSignature_LogResponse, Buf, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-	ErrorCodeEnum LogAgent(LogService_LogAgent_Info &Info)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		CAutoBuffer Buf = SpObject2Buffer(Info);
-		auto ret = pFunc->OnewayCall(LogService_Method_LogAgent, LogService_MethodSignature_LogAgent, Buf, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-	ErrorCodeEnum LogBegin(LogService_LogBegin_Info &Info)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		CAutoBuffer Buf = SpObject2Buffer(Info);
-		auto ret = pFunc->OnewayCall(LogService_Method_LogBegin, LogService_MethodSignature_LogBegin, Buf, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-	ErrorCodeEnum LogEnd(LogService_LogEnd_Info &Info)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		CAutoBuffer Buf = SpObject2Buffer(Info);
-		auto ret = pFunc->OnewayCall(LogService_Method_LogEnd, LogService_MethodSignature_LogEnd, Buf, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-	ErrorCodeEnum LogCallID(LogService_LogCallID_Info &Info)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		CAutoBuffer Buf = SpObject2Buffer(Info);
-		auto ret = pFunc->OnewayCall(LogService_Method_LogCallID, LogService_MethodSignature_LogCallID, Buf, m_context);
-		m_context.clear();
-		return ret;
-	}
-
-
-	bool SafeDelete()
-	{
-		if (!m_bSysManaged) {
-			delete this;
-		}
-		return m_bSysManaged;
-	}
-
-protected:
-	bool m_bSysManaged;
-	CEntityBase *m_pEntityBase;
-	linkContext m_context;
-	bool bSessionClosed;
-};
-
-///////////////////////////
-
-} // namespace InteractiveLog
-#endif // __INTERACTIVELOG_CLIENT_G_H

+ 0 - 182
Module/mod_interactivelog/InteractiveLog_def_g.h

@@ -1,182 +0,0 @@
-#ifndef __INTERACTIVELOG_DEF_G_H
-#define __INTERACTIVELOG_DEF_G_H
-
-#pragma once
-
-// This code is generated by spgen tool!
-
-#include "SpHelper.h"
-
-namespace InteractiveLog {
-//
-// const goes here
-//
-
-#define LogService_Method_LogFunction 0
-#define LogService_Method_LogCustomerID 1
-#define LogService_Method_LogAgreement 2
-#define LogService_Method_LogReceipt 3
-#define LogService_Method_LogOperation 4
-#define LogService_Method_LogResponse 5
-#define LogService_Method_LogAgent 6
-#define LogService_Method_LogBegin 7
-#define LogService_Method_LogEnd 8
-#define LogService_Method_LogCallID 9
-
-#define LogService_MethodSignature_LogFunction 1504975974
-#define LogService_MethodSignature_LogCustomerID 1449949503
-#define LogService_MethodSignature_LogAgreement -1000900347
-#define LogService_MethodSignature_LogReceipt 910613943
-#define LogService_MethodSignature_LogOperation -975180857
-#define LogService_MethodSignature_LogResponse -617159288
-#define LogService_MethodSignature_LogAgent 1269030039
-#define LogService_MethodSignature_LogBegin 1908299243
-#define LogService_MethodSignature_LogEnd 2006046815
-#define LogService_MethodSignature_LogCallID -555754721
-
-#define LogService_LogCode_LogFunction "QLR040210600"
-#define LogService_LogCode_LogCustomerID "QLR040210601"
-#define LogService_LogCode_LogAgreement "QLR040210602"
-#define LogService_LogCode_LogReceipt "QLR040210603"
-#define LogService_LogCode_LogOperation "QLR040210604"
-#define LogService_LogCode_LogResponse "QLR040210605"
-#define LogService_LogCode_LogAgent "QLR040210606"
-#define LogService_LogCode_LogBegin "QLR040210607"
-#define LogService_LogCode_LogEnd "QLR040210608"
-#define LogService_LogCode_LogCallID "QLR040210609"
-
-struct LogService_LogFunction_Info
-{
-	CSimpleStringW nam;
-	CSimpleStringW display;
-	CSimpleStringW product;
-	CSimpleStringW service_code;
-	int action_id;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & nam & display & product & service_code & action_id;
-	}
-
-};
-
-struct LogService_LogCustomerID_Info
-{
-	CSimpleStringW customer_id;
-	CSimpleStringW verify_method;
-	int level;
-	int action_id;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & customer_id & verify_method & level & action_id;
-	}
-
-};
-
-struct LogService_LogAgreement_Info
-{
-	CSimpleStringW content;
-	int action_id;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & content & action_id;
-	}
-
-};
-
-struct LogService_LogReceipt_Info
-{
-	CSimpleStringW content;
-	int action_id;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & content & action_id;
-	}
-
-};
-
-struct LogService_LogOperation_Info
-{
-	CSimpleStringW code;
-	CSimpleStringW content;
-	int action_id;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & code & content & action_id;
-	}
-
-};
-
-struct LogService_LogResponse_Info
-{
-	CSimpleStringW code;
-	CSimpleStringW content;
-	int action_id;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & code & content & action_id;
-	}
-
-};
-
-struct LogService_LogAgent_Info
-{
-	CSimpleStringW code;
-	CSimpleStringW content;
-	int action_id;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & code & content & action_id;
-	}
-
-};
-
-struct LogService_LogBegin_Info
-{
-	CSimpleStringW session_id;
-	int session_count;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & session_id & session_count;
-	}
-
-};
-
-struct LogService_LogEnd_Info
-{
-	CSimpleStringW session_id;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & session_id;
-	}
-
-};
-
-struct LogService_LogCallID_Info
-{
-	CSimpleStringW call_id;
-	CSimpleStringW workNumber;
-	CSimpleStringW skillCode;
-	int action_id;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & call_id & workNumber & skillCode & action_id;
-	}
-
-};
-
-
-///////////////////////////
-
-} // namespace InteractiveLog
-
-#endif // __INTERACTIVELOG_DEF_G_H

+ 0 - 353
Module/mod_interactivelog/InteractiveLog_server_g.h

@@ -1,353 +0,0 @@
-
-#ifndef __INTERACTIVELOG_SERVER_G_H
-#define __INTERACTIVELOG_SERVER_G_H
-
-#pragma once
-
-// This code is generated by spgen tool!
-
-#include "InteractiveLog_def_g.h"
-
-namespace InteractiveLog {
-class LogService_ServerSessionBase : public CServerSessionBase
-{
-public:
-	LogService_ServerSessionBase()
-	{
-		/// override by user
-	}
-
-	virtual ~LogService_ServerSessionBase()
-	{
-		/// override by user
-	}
-
-	virtual bool IsExclusive() { return false; }
-
-	virtual bool IsSessionOverlap() { return true; }
-
-	virtual ErrorCodeEnum GetMessageAttr(DWORD dwMessageID, DWORD dwSignature, bool &bOverlap)
-	{
-		ErrorCodeEnum Error = Error_Succeed;
-		switch (dwMessageID) {
-		case LogService_Method_LogFunction:
-			if (dwSignature == LogService_MethodSignature_LogFunction) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogCustomerID:
-			if (dwSignature == LogService_MethodSignature_LogCustomerID) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogAgreement:
-			if (dwSignature == LogService_MethodSignature_LogAgreement) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogReceipt:
-			if (dwSignature == LogService_MethodSignature_LogReceipt) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogOperation:
-			if (dwSignature == LogService_MethodSignature_LogOperation) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogResponse:
-			if (dwSignature == LogService_MethodSignature_LogResponse) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogAgent:
-			if (dwSignature == LogService_MethodSignature_LogAgent) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogBegin:
-			if (dwSignature == LogService_MethodSignature_LogBegin) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogEnd:
-			if (dwSignature == LogService_MethodSignature_LogEnd) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogCallID:
-			if (dwSignature == LogService_MethodSignature_LogCallID) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		default:
-			Error = Error_MethodNotFound;
-			break;
-		}
-		return Error;
-	}
-
-	int CheckMessageSignature(DWORD dwMessageID, DWORD dwSignature)
-	{
-		ErrorCodeEnum Error = Error_Succeed;
-		switch (dwMessageID) {
-		case LogService_Method_LogFunction:
-			if (dwSignature != LogService_MethodSignature_LogFunction) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogCustomerID:
-			if (dwSignature != LogService_MethodSignature_LogCustomerID) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogAgreement:
-			if (dwSignature != LogService_MethodSignature_LogAgreement) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogReceipt:
-			if (dwSignature != LogService_MethodSignature_LogReceipt) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogOperation:
-			if (dwSignature != LogService_MethodSignature_LogOperation) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogResponse:
-			if (dwSignature != LogService_MethodSignature_LogResponse) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogAgent:
-			if (dwSignature != LogService_MethodSignature_LogAgent) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogBegin:
-			if (dwSignature != LogService_MethodSignature_LogBegin) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogEnd:
-			if (dwSignature != LogService_MethodSignature_LogEnd) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case LogService_Method_LogCallID:
-			if (dwSignature != LogService_MethodSignature_LogCallID) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		default:
-			Error = Error_MethodNotFound;
-			break;
-		}
-		return Error;
-	}
-
-	virtual void Handle_LogFunction(SpOnewayCallContext<LogService_LogFunction_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_LogCustomerID(SpOnewayCallContext<LogService_LogCustomerID_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_LogAgreement(SpOnewayCallContext<LogService_LogAgreement_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_LogReceipt(SpOnewayCallContext<LogService_LogReceipt_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_LogOperation(SpOnewayCallContext<LogService_LogOperation_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_LogResponse(SpOnewayCallContext<LogService_LogResponse_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_LogAgent(SpOnewayCallContext<LogService_LogAgent_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_LogBegin(SpOnewayCallContext<LogService_LogBegin_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_LogEnd(SpOnewayCallContext<LogService_LogEnd_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_LogCallID(SpOnewayCallContext<LogService_LogCallID_Info>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void OnRequest(CSmartPointer<ITransactionContext> pTransactionContext)
-	{
-		CAutoBuffer Buf;
-		DWORD dwMessageID;
-		DWORD dwMessageSignature;
-		ErrorCodeEnum Error = pTransactionContext->GetReceiveBuffer(dwMessageID, dwMessageSignature, Buf);
-		if (Error == Error_Succeed) {
-#ifdef DEBUG
-			assert(CheckMessageSignature(dwMessageID, dwMessageSignature) == Error_Succeed);
-#else
-			if (CheckMessageSignature(dwMessageID, dwMessageSignature) != Error_Succeed) {
-				pTransactionContext->SendAnswer(Error_MethodSignatureFailed);
-				return;
-			}
-#endif
-			switch (dwMessageID) {
-				case LogService_Method_LogFunction:
-					{
-						SpOnewayCallContext<LogService_LogFunction_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<LogService_LogFunction_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_LogFunction(ctx);
-					}
-					break;
-				case LogService_Method_LogCustomerID:
-					{
-						SpOnewayCallContext<LogService_LogCustomerID_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<LogService_LogCustomerID_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_LogCustomerID(ctx);
-					}
-					break;
-				case LogService_Method_LogAgreement:
-					{
-						SpOnewayCallContext<LogService_LogAgreement_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<LogService_LogAgreement_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_LogAgreement(ctx);
-					}
-					break;
-				case LogService_Method_LogReceipt:
-					{
-						SpOnewayCallContext<LogService_LogReceipt_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<LogService_LogReceipt_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_LogReceipt(ctx);
-					}
-					break;
-				case LogService_Method_LogOperation:
-					{
-						SpOnewayCallContext<LogService_LogOperation_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<LogService_LogOperation_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_LogOperation(ctx);
-					}
-					break;
-				case LogService_Method_LogResponse:
-					{
-						SpOnewayCallContext<LogService_LogResponse_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<LogService_LogResponse_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_LogResponse(ctx);
-					}
-					break;
-				case LogService_Method_LogAgent:
-					{
-						SpOnewayCallContext<LogService_LogAgent_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<LogService_LogAgent_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_LogAgent(ctx);
-					}
-					break;
-				case LogService_Method_LogBegin:
-					{
-						SpOnewayCallContext<LogService_LogBegin_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<LogService_LogBegin_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_LogBegin(ctx);
-					}
-					break;
-				case LogService_Method_LogEnd:
-					{
-						SpOnewayCallContext<LogService_LogEnd_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<LogService_LogEnd_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_LogEnd(ctx);
-					}
-					break;
-				case LogService_Method_LogCallID:
-					{
-						SpOnewayCallContext<LogService_LogCallID_Info>::Pointer ctx;
-						ctx.Attach(new SpOnewayCallContext<LogService_LogCallID_Info>());
-						SpBuffer2Object(Buf, ctx->Info);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_LogCallID(ctx);
-					}
-					break;
-				default:
-					assert(0);
-					break;
-			}
-			
-		} else {
-			pTransactionContext->SendAnswer(Error);
-		}
-	}
-
-};
-
-
-///////////////////////////
-
-} // namespace InteractiveLog
-#endif // __INTERACTIVELOG_SERVER_G_H

+ 0 - 203
Module/mod_interactivelog/bizlog.cpp

@@ -1,203 +0,0 @@
-#include "stdafx.h"
-#include "bizlog.h"
-
-#include <memutil.h>
-#include <y2k_time.h>
-
-typedef struct session_t {
-	char *id;
-	FILE *fp;
-	char file[MAX_PATH];
-}session_t;
-
-struct bizlog_t
-{
-	char base_dir[MAX_PATH];
-	session_t *curr_session;
-};
-
-static void session_destroy(session_t *session)
-{
-	if (session) {
-		char tmp[MAX_PATH];
-		fclose(session->fp);
-		session->fp = NULL;
-		//strcpy(tmp, session->file);
-		//strcat(tmp, ".xml");
-		//MoveFileExA(session->file, tmp, MOVEFILE_REPLACE_EXISTING);
-		free(session->id);
-		free(session);
-	}
-}
-
-bizlog_t *bizlog_create(const char *base_dir)
-{
-	bizlog_t *log;
-	
-	if (!base_dir) {
-		return NULL;
-	}
-
-	log = ZALLOC_T(bizlog_t);
-
-	strcpy(log->base_dir, base_dir);
-
-	return log;
-}
-
-void bizlog_destroy(bizlog_t *log)
-{
-	if (log) {
-		if (log->curr_session) {
-			session_destroy(log->curr_session);
-			log->curr_session = NULL;
-		}
-		free(log);
-	}
-}
-
-int bizlog_has_session(bizlog_t *log)
-{
-	return !!log->curr_session;
-}
-
-// <SessionBegin Time="" SessionID=""/>
-int bizlog_session_begin(bizlog_t *log, const char *id,const char*filename)
-{
-	session_t *session;
-
-	if (!log || !id)
-		return -1;
-	
-	if (log->curr_session) {
-		session_destroy(log->curr_session);
-		log->curr_session = NULL;
-	}
-
-	session = ZALLOC_T(session_t);
-
-#ifdef RVC_OS_WIN
-	sprintf(session->file, "%s\\%s.xml", log->base_dir, filename);
-#else
-	sprintf(session->file, "%s/%s.xml", log->base_dir, filename);
-#endif
-
-	session->fp = fopen(session->file, "wb+");
-	if (!session->fp) {
-		free(session);
-		return -1;
-	}
-	session->id = _strdup(id);
-
-	y2k_time_t now = y2k_time_now();
-	fprintf(session->fp, "<SessionBegin Time=\"0x%08X\" SessionID=\"%s\"/>\r\n", now, id);
-	fflush(session->fp);
-
-	log->curr_session = session;
-
-	return 0;
-}
-
-// <SessionEnd Time="" SessionID=""/>
-int bizlog_session_end(bizlog_t *log)
-{
-	if (log->curr_session) {
-		y2k_time_t now = y2k_time_now();
-		fprintf(log->curr_session->fp, "<SessionEnd Time=\"0x%08X\" SessionID=\"%s\"/>\r\n", now, log->curr_session->id);
-		fflush(log->curr_session->fp);
-		fclose(log->curr_session->fp);
-		log->curr_session->fp = NULL;
-		session_destroy(log->curr_session);
-		log->curr_session = NULL;
-	}
-	return 0;
-}
-
-// <Function Time=”” Display=”” ServiceCode=”” ActionID=”0xAABBCCDD”/>XXX</Function>
-int bizlog_function(bizlog_t *log, const char *name, const char *display_name, const char *product, const char *service_code, int action_id)
-{
-	if (!log || !log->curr_session)
-		return -1;
-	y2k_time_t now = y2k_time_now();
-	fprintf(log->curr_session->fp, "<Function Time=\"0x%08X\" Name=\"%s\" Product=\"%s\" Display=\"%s\" ServiceCode=\"%s\" ActionID=\"0x%08X\"/>\r\n",  now, name, product, display_name, service_code, action_id);
-	fflush(log->curr_session->fp);
-	return 0;
-}
-
-// <CustomerID Time=”” Method=”RI” Level=”5” ActionID=”0xAABBCCDD”>XXX</CustomerID>
-int bizlog_call_id(bizlog_t *log, const char *call_id, const char *skillcode, const char *agent_id, int action_id)
-{
-	if (!log || !log->curr_session)
-		return -1;
-	y2k_time_t now = y2k_time_now();
-	fprintf(log->curr_session->fp, "<CallID Time=\"0x%08X\" ID=\"%s\" SkillCode=\"%s\" AgentID=\"%s\" ActionID=\"0x%08X\"/>\r\n",  now, call_id, skillcode, agent_id, action_id);
-	fflush(log->curr_session->fp);
-	return 0;
-}
-
-// <CustomerID Time=”” Method=”RI” Level=”5” ActionID=”0xAABBCCDD”>XXX</CustomerID>
-int bizlog_customer_id(bizlog_t *log, const char *customer_id, const char *verify_method, int level, int action_id)
-{
-	if (!log || !log->curr_session)
-		return -1;
-	y2k_time_t now = y2k_time_now();
-	fprintf(log->curr_session->fp, "<CustomerID Time=\"0x%08X\" ID=\"%s\" Method=\"%s\" Level=\"%d\" ActionID=\"0x%08X\"/>\r\n",  now, customer_id, verify_method, level, action_id);
-	fflush(log->curr_session->fp);
-	return 0;
-}
-
-// <Agreement Time=”” ActionID=”0xAABBCCDD”>确认要素</Agree>
-int bizlog_agreement(bizlog_t *log, const char *content, int action_id)
-{
-	if (!log || !log->curr_session)
-		return -1;
-	y2k_time_t now = y2k_time_now();
-	fprintf(log->curr_session->fp, "<Agreement Time=\"0x%08X\" ActionID=\"0x%08X\">%s</Agreement>\r\n",  now, action_id, content);
-	fflush(log->curr_session->fp);
-	return 0;
-}
-
-// <Receipt Time=”” ActionID=”0xAABBCCDD” bDone=”1”>结果要素</Receipt>
-int bizlog_receipt(bizlog_t *log, const char *content, int action_id)
-{
-	if (!log || !log->curr_session)
-		return -1;
-	y2k_time_t now = y2k_time_now();
-	fprintf(log->curr_session->fp, "<Receipt Time=\"0x%08X\" ActionID=\"0x%08X\">%s</Receipt>\r\n",  now, action_id, content);
-	fflush(log->curr_session->fp);
-	return 0;
-}
-
-// <Operation Time=”” Code=”” >xxxx</Operation>
-int bizlog_operation(bizlog_t *log, const char *op_code, const char *content, int action_id)
-{
-	if (!log || !log->curr_session)
-		return -1;
-	y2k_time_t now = y2k_time_now();
-	fprintf(log->curr_session->fp, "<Operation Time=\"0x%08X\" Code=\"%s\" ActionID=\"0x%08X\">%s</Operation>\r\n",  now, op_code, action_id, content);
-	fflush(log->curr_session->fp);
-	return 0;
-}
-
-// <Response Time=”” Code=””>xxxx</Response>
-int bizlog_response(bizlog_t *log, const char *ret_code, const char *content, int action_id)
-{
-	if (!log || !log->curr_session)
-		return -1;
-	y2k_time_t now = y2k_time_now();
-	fprintf(log->curr_session->fp, "<Response Time=\"0x%08X\" Code=\"%s\" ActionID=\"0x%08X\">%s</Response>\r\n",  now, ret_code, action_id, content);
-	fflush(log->curr_session->fp);
-	return 0;
-}
-
-// <Agent Time=”” Code=”” ActionID=”0xAABBCCDD”>XXX</Agent>
-int bizlog_agent(bizlog_t *log, const char *op_code, const char *content, int action_id)
-{
-	if (!log || !log->curr_session)
-		return -1;
-	y2k_time_t now = y2k_time_now();
-	fprintf(log->curr_session->fp, "<Agent Time=\"0x%08X\" Code=\"%s\" ActionID=\"0x%08X\">%s</Agent>\r\n",  now, op_code, action_id, content);
-	fflush(log->curr_session->fp);
-	return 0;
-}
-

+ 0 - 22
Module/mod_interactivelog/bizlog.h

@@ -1,22 +0,0 @@
-#ifndef BIZLOG_H
-#define BIZLOG_H
-
-#pragma once
-
-typedef struct bizlog_t bizlog_t;
-
-bizlog_t *bizlog_create(const char *base_dir);
-void bizlog_destroy(bizlog_t *log);
-int bizlog_has_session(bizlog_t *log);
-int bizlog_session_begin(bizlog_t *log, const char *session,const char*filename=NULL);
-int bizlog_session_end(bizlog_t *log);
-int bizlog_function(bizlog_t *log, const char *name, const char *display_name, const char *product, const char *service_code, int action_id);
-int bizlog_customer_id(bizlog_t *log, const char *customer_id, const char *verify_method, int level, int action_id);
-int bizlog_agreement(bizlog_t *log, const char *content, int action_id);
-int bizlog_receipt(bizlog_t *log, const char *content, int action_id);
-int bizlog_operation(bizlog_t *log, const char *op_code, const char *content, int action_id);
-int bizlog_response(bizlog_t *log, const char *ret_code, const char *content, int action_id);
-int bizlog_agent(bizlog_t *log, const char *op_code, const char *content, int action_id);
-int bizlog_call_id(bizlog_t *log, const char *call_id, const char *skillcode, const char *agent_id, int action_id);
-
-#endif // BIZLOG_H

+ 0 - 450
Module/mod_interactivelog/mod_interactivelog.cpp

@@ -1,450 +0,0 @@
-#include "stdafx.h"
-#include "SpBase.h"
-#include "Event.h"
-
-#ifndef _WIN32
-#include <time.h>
-#endif // !_WIN32
-
-
-
-
-#include "InteractiveLog_server_g.h"
-#include "../mod_customeraware/Event.h"
-using namespace InteractiveLog;
-
-#include "bizlog.h"
-
-class CInterativeLogEntity;
-
-class ServerSession : public LogService_ServerSessionBase
-{
-public:
-	ServerSession(CInterativeLogEntity *pEntity) : m_pEntity(pEntity) {}
-
-	virtual void Handle_LogFunction(SpOnewayCallContext<LogService_LogFunction_Info>::Pointer ctx);
-	virtual void Handle_LogCustomerID(SpOnewayCallContext<LogService_LogCustomerID_Info>::Pointer ctx);
-	virtual void Handle_LogAgreement(SpOnewayCallContext<LogService_LogAgreement_Info>::Pointer ctx);
-	virtual void Handle_LogReceipt(SpOnewayCallContext<LogService_LogReceipt_Info>::Pointer ctx);
-	virtual void Handle_LogOperation(SpOnewayCallContext<LogService_LogOperation_Info>::Pointer ctx);
-	virtual void Handle_LogResponse(SpOnewayCallContext<LogService_LogResponse_Info>::Pointer ctx);
-	virtual void Handle_LogAgent(SpOnewayCallContext<LogService_LogAgent_Info>::Pointer ctx);
-	virtual void Handle_LogBegin(SpOnewayCallContext<LogService_LogBegin_Info>::Pointer ctx);
-	virtual void Handle_LogEnd(SpOnewayCallContext<LogService_LogEnd_Info>::Pointer ctx);
-	virtual void Handle_LogCallID(SpOnewayCallContext<LogService_LogCallID_Info>::Pointer ctx);
-private:
-	CInterativeLogEntity *m_pEntity;
-};
-
-// 0x
-
-class CInterativeLogEntity : public CEntityBase, public ILogListener, public ISysVarListener
-{
-public:
-	CInterativeLogEntity() : m_log(NULL) {}
-	virtual ~CInterativeLogEntity() {}
-	virtual const char *GetEntityName() const { return "InteractiveLog"; }
-	virtual bool IsService()const{return true;}
-
-	virtual void OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPointer<ITransactionContext> pTransactionContext) 
-	{
-		ErrorCodeEnum Error;
-		CSimpleStringA strPath;
-		m_nDesktopType = 0;
-		m_strSessionCount = "0";
-#ifdef RVC_OS_WIN
-		Error = GetFunction()->GetPath("InterLog", strPath);
-		if (Error != Error_Succeed) {
-			LOG_TRACE("getpath InterLog failed!");
-		}
-		m_log = bizlog_create((LPCSTR)strPath);
-		if (!m_log) 
-		{
-			Error = Error_Param;
-			LOG_TRACE("create bizlog object failed!");
-		}
-#else
-		Error = Error_Succeed;
-#endif
-
-		{
-			CSmartPointer<IEntityFunction> Func = GetFunction();
-			CSimpleStringA strValue;
-			if (Func->RegistSysVarEvent(SYSVAR_DESKTOPTYPE, this) != Error_Succeed) 
-			{
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("register sysvar %s failed!", SYSVAR_DESKTOPTYPE);
-			}
-			else
-			{
-				Func->GetSysVar(SYSVAR_DESKTOPTYPE, strValue);
-				if (strValue[0] ==DESKTOPTYPE_BUS)		//切换到业务屏,打开LOG	
-				{
-					m_nDesktopType = 0;
-				} 
-				else if (strValue[0] == DESKTOPTYPE_INFO)	//切换到信息屏,屏蔽LOG
-				{
-					m_nDesktopType = 1;
-				} 
-				else if (strValue[0] == DESKTOPTYPE_USER)	//切换到用户桌面,屏蔽LOG
-				{
-					m_nDesktopType = 2;
-				}
-				else
-				{
-					Dbg("unknown  desktop type!");
-				}
-			}
-		}
-
-		/*{
-			CSmartPointer<IEntityFunction> Func = GetFunction();
-			CSimpleStringA strValue;
-			if (Func->RegistSysVarEvent("SessionCount", this) != Error_Succeed) 
-			{
-				LOG_TRACE("register sysvar %SessionCount failed!");
-			}
-			else
-			{
-				Func->GetSysVar("SessionCount", m_strSessionCount);
-				Dbg("SessionCount = %s",m_strSessionCount);
-			}
-		}
-*/
-		GetFunction()->SubscribeLog(m_SubIDStopRecord, this, Log_Event, Severity_Middle, Error_IgnoreAll, EVENT_MOD_CUSTOMERAWARE_END, NULL, false);
-		pTransactionContext->SendAnswer(Error);
-	}
-
-	virtual void OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,const LogTypeEnum eLogType, const SeverityLevelEnum eLevel,
-		const DWORD dwSysError,const DWORD dwUserCode,const DWORD dwEntityInstanceID, const WORD wEntityDevelID, 
-		const CAutoArray<DWORD> &Param, const char *pszEntityName, const char *pszModuleName,const char *pszMessage, const linkContext& pLinkInfo)
-	{
-		if (dwUserCode == EVENT_MOD_CUSTOMERAWARE_END) 
-		{
-			ErrorCodeEnum errCode;
-			errCode = GetFunction()->SetSysVar("CustomerID","N");
-			if (errCode != Error_Succeed)
-			{
-				Dbg("set CustomerID failed (%d).",errCode);
-			}
-			else
-			{
-				Dbg("set customerid to N");
-			}
-		}
-	}
-
-	virtual void OnPreClose(EntityCloseCauseEnum eCloseCause,CSmartPointer<ITransactionContext> pTransactionContext) 
-	{ 
-#ifdef RVC_OS_WIN
-		if (m_log)
-		{
-			bizlog_destroy(m_log);
-			m_log = NULL;
-		}
-#endif
-		GetFunction()->UnsubscribeLog(m_SubIDStopRecord);
-		pTransactionContext->SendAnswer(Error_Succeed); 
-	}
-
-	virtual void OnSysVarEvent(const char *pszKey, const char *pszValue,const char *pszOldValue,const char *pszEntityName)
-	{
-		if (_stricmp(pszKey, SYSVAR_DESKTOPTYPE) == 0)
-		{
-			Dbg("desktop type from : %c to %c", pszOldValue[0], pszValue[0]);
-			if ((pszOldValue[0]==DESKTOPTYPE_BUS))  //如果从业务屏切换到其他屏,自动关闭当前interlog
-			{
-				LogEnd();
-			}
-
-			if (pszValue[0] == DESKTOPTYPE_BUS)			//切换到业务屏,打开LOG
-			{
-				m_nDesktopType = 0;
-			} 
-			else if (pszValue[0] == DESKTOPTYPE_INFO)	//切换到信息屏,屏蔽LOG
-			{
-				m_nDesktopType = 1;
-			} 
-			else if (pszValue[0] == DESKTOPTYPE_USER)	//切换到用户桌面,屏蔽LOG
-			{
-				m_nDesktopType = 2;
-			}
-			else
-			{
-				Dbg("unknown  desktop type!");
-			}
-		}
-		//else if (_stricmp(pszKey, "SessionCount") == 0)
-		//{
-		//	GetFunction()->GetSysVar("SessionCount", m_strSessionCount);
-		//	Dbg("SessionCount = %s",m_strSessionCount);
-		//}
-	}
-
-	virtual CServerSessionBase *OnNewSession(const char* /*pszRemoteEntityName*/, const char * /*pszParam*/)
-	{
-		LOG_FUNCTION();
-		return new ServerSession(this);
-	}
-
-	void LogFunction(SpOnewayCallContext<LogService_LogFunction_Info>::Pointer ctx)
-	{
-		//Prepare();
-		if (m_nDesktopType != 0)   //如果不是业务状态
-		{
-			Dbg("LogFunction,desktop type is not B,ignore");
-			return;
-		}
-#ifdef RVC_OS_WIN
-		CSimpleStringA name = CSimpleStringW2A(ctx->Info.nam);
-		CSimpleStringA display = CSimpleStringW2A(ctx->Info.display);
-		CSimpleStringA product = CSimpleStringW2A(ctx->Info.product);
-		CSimpleStringA service_code = CSimpleStringW2A(ctx->Info.service_code);
-		bizlog_function(m_log, name, display, product, service_code, ctx->Info.action_id);
-#endif
-	}
-
-	void LogCustomerID(SpOnewayCallContext<LogService_LogCustomerID_Info>::Pointer ctx)
-	{
-		if (m_nDesktopType != 0)   //如果不是业务状态
-		{
-			Dbg("LogCustomerID,desktop type is not B,ignore");
-			return;
-		}
-		//Prepare();
-		CSimpleStringA customer_id = CSimpleStringW2A(ctx->Info.customer_id);
-		ErrorCodeEnum errCode;
-		errCode = GetFunction()->SetSysVar("CustomerID",customer_id);
-		Dbg("set CustomerID to %s",customer_id.GetData());
-		if (errCode != Error_Succeed)
-		{
-			Dbg("set CustomerID failed (%d).",errCode);
-		}
-#ifdef RVC_OS_WIN
-		CSimpleStringA verify_method = CSimpleStringW2A(ctx->Info.verify_method);
-		bizlog_customer_id(m_log, customer_id, verify_method, ctx->Info.level, ctx->Info.action_id);
-#endif
-	}
-
-	void LogAgreement(SpOnewayCallContext<LogService_LogAgreement_Info>::Pointer ctx)
-	{
-		if (m_nDesktopType != 0)   //如果不是业务状态
-		{
-			Dbg("LogAgreement,desktop type is not B,ignore");
-			return;
-		}
-		//Prepare();
-#ifdef RVC_OS_WIN
-		CSimpleStringA content = CSimpleStringW2A(ctx->Info.content);
-		bizlog_agreement(m_log, content, ctx->Info.action_id);
-#endif
-	}
-
-	void LogReceipt(SpOnewayCallContext<LogService_LogReceipt_Info>::Pointer ctx)
-	{
-		if (m_nDesktopType != 0)   //如果不是业务状态
-		{
-			Dbg("LogReceipt,desktop type is not B,ignore");
-			return;
-		}
-		//Prepare();
-#ifdef RVC_OS_WIN
-		CSimpleStringA content = CSimpleStringW2A(ctx->Info.content);
-		bizlog_receipt(m_log, content, ctx->Info.action_id);
-#endif
-	}
-
-	void LogOperation(SpOnewayCallContext<LogService_LogOperation_Info>::Pointer ctx)
-	{
-		if (m_nDesktopType != 0)   //如果不是业务状态
-		{
-			Dbg("LogOperation,desktop type is not B,ignore");
-			return;
-		}
-		//Prepare();
-#ifdef RVC_OS_WIN
-		CSimpleStringA code = CSimpleStringW2A(ctx->Info.code);
-		CSimpleStringA content = CSimpleStringW2A(ctx->Info.content);
-		bizlog_operation(m_log, code, content, ctx->Info.action_id);
-#endif
-	}
-
-	void LogResponse(SpOnewayCallContext<LogService_LogResponse_Info>::Pointer ctx)
-	{
-		if (m_nDesktopType != 0)   //如果不是业务状态
-		{
-			Dbg("LogResponse,desktop type is not B,ignore");
-			return;
-		}
-		//Prepare();
-#ifdef RVC_OS_WIN
-		CSimpleStringA code = CSimpleStringW2A(ctx->Info.code);
-		CSimpleStringA content = CSimpleStringW2A(ctx->Info.content);
-		bizlog_response(m_log, code, content, ctx->Info.action_id);
-#endif
-	}
-
-	void LogAgent(SpOnewayCallContext<LogService_LogAgent_Info>::Pointer ctx)
-	{
-		if (m_nDesktopType != 0)   //如果不是业务状态
-		{
-			Dbg("LogAgent,desktop type is not B,ignore");
-			return;
-		}
-		//Prepare();
-#ifdef RVC_OS_WIN
-		CSimpleStringA code = CSimpleStringW2A(ctx->Info.code);
-		CSimpleStringA content = CSimpleStringW2A(ctx->Info.content);
-		bizlog_agent(m_log, code, content, ctx->Info.action_id);
-#endif
-	}
-
-	void LogBegin(SpOnewayCallContext<LogService_LogBegin_Info>::Pointer ctx)
-	{
-		if (m_nDesktopType != 0)   //如果不是业务状态
-		{
-			Dbg("LogBegin,desktop type is not B,ignore");
-			return;
-		}
-		//Prepare();
-		Dbg("log Begin get sessionid and sessioncnt");
-		CSimpleStringA session_id = CSimpleStringW2A(ctx->Info.session_id);
-		//文件名定为YYYYMMDD_XXX_SessionID。xxx为业务浏览器记录的运行时SessionID变化次数
-		
-		char strtimebuffer[256] = {0};
-
-#ifdef RVC_OS_WIN
-		SYSTEMTIME nowTime;                             // 系统时间结构体
-		GetLocalTime(&nowTime);
-		sprintf_s(strtimebuffer, "%4d%02d%02d", nowTime.wYear, nowTime.wMonth, nowTime.wDay);
-#else
-		struct tm* t;
-		time_t tt;
-		time(&tt);
-		t = localtime(&tt);
-		snprintf(strtimebuffer, 256, "%4d%02d%02d", t->tm_year+1900, t->tm_mon+1, t->tm_mday);
-#endif
-
-		CSimpleStringA strTime = strtimebuffer;
-		m_strSessionCount = CSimpleStringA::Format("%d",ctx->Info.session_count);
-		//Dbg("SessionCount = %s",m_strSessionCount.GetData());
-#ifdef RVC_OS_WIN
-		CSimpleStringA filename = strTime + "_" + m_strSessionCount + "_" + session_id;
-		bizlog_session_begin(m_log, session_id, filename);
-		Dbg("Begin new log -- %s", filename.GetData());
-#endif
-	}
-
-	void LogEnd(SpOnewayCallContext<LogService_LogEnd_Info>::Pointer ctx)
-	{
-		if (m_nDesktopType != 0)   //如果不是业务状态
-		{
-			Dbg("LogEnd,desktop type is not B,ignore");
-			return;
-		}
-		//Prepare();
-#ifdef RVC_OS_WIN
-		bizlog_session_end(m_log);
-		Dbg("End log");
-#endif
-	}
-
-	void LogEnd()
-	{
-#ifdef RVC_OS_WIN
-		bizlog_session_end(m_log);
-		Dbg("Desktop type change to !B,Auto End log");
-#endif
-	}
-
-	void LogCallID(SpOnewayCallContext<LogService_LogCallID_Info>::Pointer ctx)
-	{
-		if (m_nDesktopType != 0)   //如果不是业务状态
-		{
-			Dbg("LogCallID,desktop type is not B,ignore");
-			return;
-		}
-#ifdef RVC_OS_WIN
-		CSimpleStringA callid = CSimpleStringW2A(ctx->Info.call_id);
-		CSimpleStringA agentid = CSimpleStringW2A(ctx->Info.workNumber);
-		CSimpleStringA skillCode = CSimpleStringW2A(ctx->Info.skillCode);
-		bizlog_call_id(m_log, callid, skillCode, agentid, ctx->Info.action_id);
-#endif
-	}
-
-	void Prepare()
-	{
-		//if (m_log) 
-		//{
-		//	if (!bizlog_has_session(m_log)) 
-		//	{
-		//		m_uid = CUUID::Create(m_uid);
-		//		bizlog_session_begin(m_log, m_uid.ToString());
-		//	}
-		//}
-	}
-
-private:
-	CUUID m_SubIDStopRecord;
-	bizlog_t *m_log;
-	int m_nDesktopType;  //0:业务屏,1:信息屏,2:用户桌面
-	CSimpleStringA m_strSessionCount;
-};
-
-void ServerSession::Handle_LogFunction(SpOnewayCallContext<LogService_LogFunction_Info>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	m_pEntity->LogFunction(ctx);
-}
-void ServerSession::Handle_LogCustomerID(SpOnewayCallContext<LogService_LogCustomerID_Info>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	m_pEntity->LogCustomerID(ctx);
-}
-void ServerSession::Handle_LogAgreement(SpOnewayCallContext<LogService_LogAgreement_Info>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	m_pEntity->LogAgreement(ctx);
-}
-void ServerSession::Handle_LogReceipt(SpOnewayCallContext<LogService_LogReceipt_Info>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	m_pEntity->LogReceipt(ctx);
-}
-void ServerSession::Handle_LogOperation(SpOnewayCallContext<LogService_LogOperation_Info>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	m_pEntity->LogOperation(ctx);
-}
-void ServerSession::Handle_LogResponse(SpOnewayCallContext<LogService_LogResponse_Info>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	m_pEntity->LogResponse(ctx);
-}
-void ServerSession::Handle_LogAgent(SpOnewayCallContext<LogService_LogAgent_Info>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	m_pEntity->LogAgent(ctx);
-}
-
-void ServerSession::Handle_LogBegin(SpOnewayCallContext<LogService_LogBegin_Info>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	m_pEntity->LogBegin(ctx);
-}
-
-void ServerSession::Handle_LogEnd(SpOnewayCallContext<LogService_LogEnd_Info>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	m_pEntity->LogEnd(ctx);
-}
-
-void ServerSession::Handle_LogCallID(SpOnewayCallContext<LogService_LogCallID_Info>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	m_pEntity->LogCallID(ctx);
-}
-
-SP_BEGIN_ENTITY_MAP()
-	SP_ENTITY(CInterativeLogEntity)
-SP_END_ENTITY_MAP()
-

+ 0 - 3
Module/mod_livenessdetection/CMakeLists.txt

@@ -26,7 +26,6 @@ set(MOD_VERSION_STRING "0.0.1-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
 
-
 if(MSVC)
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}
@@ -73,7 +72,6 @@ target_link_directories(${MODULE_NAME} PRIVATE
 
 
 # 添加实体需要依赖的其他共享库(包括系统库)
-message(STATUS "OPENCV_DYNAMIC_LIBS ${OPENCV_DYNAMIC_LIBS}")
 message(STATUS "CONAN_PKG_LIBS_OPENSSL ${CONAN_PKG_LIBS_OPENSSL}")
 
 if(WIN32)
@@ -86,7 +84,6 @@ set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_LIBS}
 )
 else(WIN32)
 set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_LIBS} 
-	${OPENCV_DYNAMIC_LIBS}
 	${SPBASE_LIB}
 	videoqueue
 )