#IQRV #comment 去除 SpTest和modVer的引用

Module/mod_ContactlessCard/mod_ContactlessCard.h

@@ -4,7 +4,6 @@
 #include "stdafx.h"
 #include "ContactlessFSM.h"
 #include "DevEntityCommBase.hpp"
-#include "modVer.h"
 
 class CContactlessCardEntity;
 

Module/mod_HSPScanner/mod_HSPScanner.h

@@ -3,14 +3,9 @@
 
 #pragma once
 
-#ifndef _WIN32
-#include "modVer.h"
-#include "SpTest.h"
 #include "DevEntityCommBase.hpp"
-#endif //NOT _WIN32
 #include "HSPScannerFSM.h"
 
-
 using namespace HSPScanner;
 
 class CHSPScannerEntity;
@@ -68,12 +63,6 @@ public:
 	virtual ~CHSPScannerEntity() {}
 	virtual const char *GetEntityName() const { return "HSPScanner"; }
 
-#ifndef _WIN32
-	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
-
-	ON_ENTITYT_TEST()
-#endif //NOT _WIN32
-
 	virtual CServerSessionBase* OnNewSession(const char* , const char * )
 	{
 		return new CHSPScannerServerSession(this);

Module/mod_ResourceWatcher/mod_ResourceWatcher.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "modVer.h"
 #include "ResourceWatcherFSM.h"
 #include "UOSTools.hpp"
 #include "fileutil.h"
@@ -68,7 +67,6 @@ public:
 	ResourceWatcherEntity(){}
 	virtual ~ResourceWatcherEntity() {}
 	virtual const char* GetEntityName() const { return "ResourceWatcher"; }
-    const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 
 	virtual CServerSessionBase* OnNewSession(const char*, const char*)
 	{

Module/mod_SalesRecorder/mod_SalesRecorder.h

@@ -51,8 +51,6 @@ namespace SalesRecorder {
 
 		virtual const char *GetEntityName() const { return "SalesRecorder"; }
 
-		const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
-
 		virtual bool IsService() const{ return true; }
 
 		virtual CServerSessionBase *OnNewSession(const char* pszRemoteEntityName, const char * pszClass);

Module/mod_ScannerSet/mod_ScannerSet.h

@@ -3,11 +3,6 @@
 
 #pragma once
 
-#include "modVer.h"
-#if defined(RVC_OS_LINUX)
-#include "SpTest.h"
-#endif //RVC_OS_LINUX
-
 #include "ScannerSetFSM.h"
 #include "EventCode.h"
 #include "ScannerSet_UserErrorCode.h"
@@ -81,12 +76,6 @@ public:
 	}
 	virtual const char *GetEntityName() const { return "ScannerSet"; }
 
-    const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
-
-#if defined(RVC_OS_LINUX)
-	ON_ENTITYT_TEST()
-#endif //RVC_OS_LINUX
-
 	virtual CServerSessionBase* OnNewSession(const char* , const char * )
 	{
 		return new ScannerServerSession(this);

Module/mod_assistantchannel/mod_assistantchannel.h

@@ -2,8 +2,6 @@
 #define RVC_MOD_ASSISTANTCHANNEL_H__
 
 #include "SpBase.h"
-#include "SpTest.h"
-#include "modVer.h"
 #include "VideoDesc.h"
 
 #include "AssistantChannel_server_g.h"
@@ -26,11 +24,8 @@ public:
 	CBizChannelEntity() : m_id_seq(0) {}
 	virtual ~CBizChannelEntity() {}
 	virtual const char* GetEntityName() const { return "AssistantChannel"; }
-	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 	virtual bool IsService()const { return true; }
 
-	ON_ENTITYT_TEST()
-
 	virtual void OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPointer<ITransactionContext> pTransactionContext); 
 	virtual void OnPreClose(EntityCloseCauseEnum eCloseCause,CSmartPointer<ITransactionContext> pTransactionContext);
 	ErrorCodeEnum __OnStart(ErrorCodeEnum preOperationError);

Module/mod_chromium/mod_chromium.h

@@ -7,8 +7,6 @@
 #include<tuple>
 #if (defined _WIN32 || defined _WIN64)
 #include "job.h"
-#else
-#include "modVer.h"
 #endif
 #include "guitask/enum.h"
 #include "../mod_healthmanager/HealthManager_msg_g.h"
@@ -64,10 +62,7 @@ namespace Chromium {
 		CChromiumEntity();
 		virtual ~CChromiumEntity();
 		virtual const char* GetEntityName() const { return "Chromium"; }
-#if (defined _WIN32 || defined _WIN64)
-#else
-		const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
-#endif
+
 		virtual bool IsService()const { return true; }
 
 		virtual CServerSessionBase* OnNewSession(const char* /*pszRemoteEntityName*/, const char* /*pszParam*/)

Module/mod_counterconnector/mod_counterconnector.h

@@ -56,7 +56,6 @@ public:
 	}
 	virtual ~CCounterConnectorEntity() {}
 	virtual const char *GetEntityName() const { return "CounterConnector"; }
-	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 
 	virtual void OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPointer<ITransactionContext> pTransactionContext);
 	virtual void OnPreClose(EntityCloseCauseEnum eCloseCause,CSmartPointer<ITransactionContext> pTransactionContext);

Module/mod_evtconverter/mod_evtconverter.cpp

@@ -3,7 +3,6 @@
 #include "evtengine.h"
 #include "EventCode.h"
 #include "fileutil.h"
-#include "modVer.h"
 
 #include "SipphoneEvent.hpp"
 #include "CustomerApproachEvent.hpp"
@@ -22,7 +21,6 @@ public:
 	CEventConverterEntity() : m_pEngine(NULL), m_lIdSeq(0) {}
 	virtual ~CEventConverterEntity() {}
 	virtual const char *GetEntityName() const { return "EventConverter"; }
-	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 	
 	virtual void OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPointer<ITransactionContext> pTransactionContext) 
 	{ 

Module/mod_gpio/mod_gpio.h

@@ -1,7 +1,6 @@
 #ifndef __MOD_GPIO_H
 #define __MOD_GPIO_H
 
-#include "modVer.h"
 #include "SpBase.h"
 
 #include "Gpio_server_g.h"
@@ -37,7 +36,6 @@ public:
 	}
 	virtual ~CGpioEntity(){}
 	virtual const char* GetEntityName()const {return "Gpio";}
-	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 	
 	virtual void OnPreStart(CAutoArray<CSimpleStringA> strArgs, CSmartPointer<ITransactionContext> pTransactionContext);
 	virtual void OnPrePause(CSmartPointer<ITransactionContext> pTransactionContext)

Module/mod_guiconsole/mod_GuiConsole.h

@@ -56,7 +56,6 @@ public:
 
 	virtual ~CGUIConsoleEntity();
 	virtual const char *GetEntityName() const { return "GUIConsole"; }
-	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 	virtual bool IsService()const{return true;}
 
 	virtual void OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPointer<ITransactionContext> pTransactionContext);

Module/mod_healthmanager/mod_healthmanager.h

@@ -3,10 +3,6 @@
 
 #include <map>
 #include "SpBase.h"
-#if defined(RVC_OS_LINUX)
-#include "modVer.h"
-#include "SpTest.h"
-#endif
 #include "HealthManagerFSM.h"
 #include "EventCode.h"
 #include "HealthManager_server_g.h"
@@ -88,7 +84,6 @@ public:
 		, m_bToRestartByCenterSetting(false){}
 	virtual ~CHealthManagerEntity() {}
 	virtual const char *GetEntityName() const { return "HealthManager"; }
-	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 
 	virtual void OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPointer<ITransactionContext> pTransactionContext) 
 	{

Module/mod_localmediaplay/mod_localmediaplay.h

@@ -22,9 +22,6 @@
 #include "AdvertManage/mediaManage.h"
 #include <iostream>
 #include <vector>
-
-
-#include "modVer.h"
 #include "EventCode.h"
 
 
@@ -73,11 +70,6 @@ public:
 
 	virtual bool IsService() const { return true; }
 
-	const char* GetEntityVersion() const override
-	{
-		return MODULE_VERSION_FULL;
-	}
-
 	virtual CServerSessionBase *OnNewSession(const char* pszRemoteEntityName, const char * pszClass);
 
 	virtual DeviceTypeEnum RvcGetDeviceType();

Module/mod_tokenmgr/mod_tokenmgr.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "modVer.h"
 #include "SpBase.h"
 
 #include "TokenKeeper_server_g.h"
@@ -49,7 +48,6 @@ public:
 	virtual ~CTokenManagerEntity() {}
 
 	virtual const char *GetEntityName() const { return "TokenKeeper"; }
-	const char* GetEntityVersion() const { return MODULE_VERSION_FULL; }
 
 	virtual bool IsService()const { return true; }