!10851 合并上传实体日志精简项目

Merge pull request !10851 from 80174520/feature_upload_fixlog

Module/mod_chromium/CModTools.cpp

@@ -1365,73 +1365,6 @@ namespace Chromium {
 		return usercode;
 	}
 
-	bool CModTools::CheckTradeRecord() {
-		std::list<int> timeList;
-
-		using namespace Upload;
-		UploadService_ClientBase* pClient = new UploadService_ClientBase(m_pEntity);
-		auto rc = pClient->Connect();
-		if (rc != Error_Succeed)
-		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("connect to Upload entity fail: %d", rc);
-			pClient->SafeDelete();
-			pClient = NULL;
-		}
-		else
-		{
-			UploadService_UploadDateList_Req req = {};
-			UploadService_UploadDateList_Ans ans = {};
-
-			rc = (*pClient)(EntityResource::getLink().upgradeLink())->UploadDateList(req, ans, 10000);
-
-			if (rc != Error_Succeed)
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("get CreateProcessRunAs fail from FreeRDPWrap: %d", rc);
-			else
-			{
-				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("UploadDateList succeed from Upload");
-				for (int i = 0; i < ans.uploadDateStr.GetCount(); ++i)
-				{
-					CSimpleStringA str = (CSimpleStringA)ans.uploadDateStr[i];
-					int t = StandardToStamp(ans.uploadDateStr[i], true);
-					timeList.emplace_back(t);
-				}
-			}
-			pClient->GetFunction()->CloseSession();
-			pClient = NULL;
-
-		}
-
-		// 比较时间戳 登记时间 <= 列表时间 < 今天 返回true
-		time_t now = time(0);
-		localtime(&now);
-		now -= now % (3600 * 24);
-		now -= 3600 * 8; //处理东八区问题
-		CSmartPointer<IConfigInfo> spConfig;
-		m_pEntity->GetFunction()->OpenConfig(Config_Run, spConfig);
-		CSimpleStringA strLastRecordTime = "";
-		ErrorCodeEnum errorRead = Error_Succeed;
-		errorRead = spConfig->ReadConfigValue("Record", "LastRecordTime", strLastRecordTime);
-		if (errorRead != Error_Succeed)
-		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Read Record LastRecordTime -> Failed! Maybe LastRecordTime not exist!");
-			strLastRecordTime = "";
-		}
-
-		int timestamp_lastRecordTime = now;
-		if (!strLastRecordTime.IsNullOrEmpty())
-		{
-			timestamp_lastRecordTime = StandardToStamp(strLastRecordTime, false);
-		}
-		for (std::list<int>::iterator it = timeList.begin(); it != timeList.end(); ++it)
-		{
-			if (timestamp_lastRecordTime <= *it && *it < now)
-			{
-				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("CheckTradeRecord lastRecordTime=%d, time_list=%d, now=%d", timestamp_lastRecordTime, *it, now);
-				return true;
-			}
-		}
-		return false;
-	}
 
     void CModTools::InitBrowserUseMode()
     {

Module/mod_chromium/CModTools.h

@@ -114,7 +114,7 @@ namespace Chromium {
 		std::string GetSpShellNextRebootTime();
 		void setLimitReason(const char* reason);
 		int StandardToStamp(const char* str_time, bool dateOnly);
-		bool CheckTradeRecord();
+		
 		void InitBrowserUseMode();
 		//0: 检测失败；1:使用旧版UOS浏览器uos-browser-stable ；2:使用新版UOS浏览器org.deepin.browser
 		int ToGetUOSBrowserType();

Module/mod_upload/Upload.xml

@@ -1,36 +1,5 @@
 <?xml version="1.0" encoding="gb2312" ?>
 <entity name="Upload">
 	<class name="UploadService" overlap="true" exclusive="false">
-	<!--上传进度-->
-    <twoway name="UploadProgess" overlap="true">
-		<res>
-			<!--0:初始 1:不可用 2：可用 3 建立连接 4上传中 5 上传结束-->
-			<param name="uploadState" type="int"/>
-			<param name="uploadNumber" type="int"/>
-			<param name="elapseTime" type="wstring"/>
-		</res> 
-	</twoway>
-	<!--剩余要上传的文件数目-->
-	<twoway name="UploadNumber" overlap="true">
-		<req>
-			<param name="silentTime" type="int"/>
-		</req>
-		<res>
-			<param name="uploadNumber" type="int"/>
-		</res>
-	</twoway>
-	<!--上传日期列表-->
-    <twoway name="UploadDateList" overlap="true">
-		<res>
-			<!--以逗号为分隔符的日期字符串-->
-			<param name="uploadDateStr" type="array_string"/>
-		</res> 
-	</twoway>
-	<!--清空上传日期列表-->
-	<twoway name="ClearUploadDate" overlap="true">
-		<res>
-			<param name="isOK" type="bool"/>
-		</res>
-	</twoway>
 	</class>
 </entity>

Module/mod_upload/UploadFSM.cpp

@@ -759,12 +759,12 @@ void UploadFSM::OnSysVarEvent( const char *pszKey, const char *pszValue,const ch
 {
 	//DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("rx sysvar %s from %s, %s to %s", pszKey, pszEntityName, pszOldValue, pszValue);
 	if (pszValue[0] == 'O') {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("rx sysvar %s from %s, %s to %s", pszKey, pszEntityName, pszOldValue, pszValue);
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("rx sysvar %s from %s, %s to %s", pszKey, pszEntityName, pszOldValue, pszValue);
 		m_isOffLine = true;
 		PostEventFIFO(new FSMEvent(USER_EVT_JMP_ENABLE));
 	} else {
 		if (m_isOffLine) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("rx sysvar %s from %s, %s to %s", pszKey, pszEntityName, pszOldValue, pszValue);
+			//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("rx sysvar %s from %s, %s to %s", pszKey, pszEntityName, pszOldValue, pszValue);
 		}
 		m_isOffLine = false;
 		PostEventFIFO(new FSMEvent(USER_EVT_JMP_DISABLE));
@@ -784,19 +784,19 @@ ErrorCodeEnum UploadFSM::OnInit()
 	if(Error==Error_Succeed){
 		//获取模式控制参数
 		m_centerModel = (int)centerModel;//强制总行模式
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("model is centerModel, CenterModel = %d", m_centerModel);
+		//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("model is centerModel, CenterModel = %d", m_centerModel);
 
 		m_centerUrl.queryPlanUrl = QUERY_PLAN_URL;
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("init read queryPlanUrl=%s", m_centerUrl.queryPlanUrl.c_str());
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("init read queryPlanUrl=%s", m_centerUrl.queryPlanUrl.c_str());
 
 		m_centerUrl.queryTempFileUrl = QUERY_TEMP_FILE_URL;
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("init read queryTempFileUrl=%s", m_centerUrl.queryTempFileUrl.c_str());
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("init read queryTempFileUrl=%s", m_centerUrl.queryTempFileUrl.c_str());
 
 		m_centerUrl.updateStateUrl = UPDATE_STATE_URL;
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("init read updateStateUrl=%s", m_centerUrl.updateStateUrl.c_str());
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("init read updateStateUrl=%s", m_centerUrl.updateStateUrl.c_str());
 
 		m_centerUrl.addUploadFailUrl = ADD_UPLOAD_FAIL_URL;
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("init read addUploadFailUrl=%s", m_centerUrl.addUploadFailUrl.c_str());
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("init read addUploadFailUrl=%s", m_centerUrl.addUploadFailUrl.c_str());
 
 		//增加总行接口Url参数
 		CSimpleStringA str="";
@@ -847,7 +847,7 @@ ErrorCodeEnum UploadFSM::OnInit()
 		Error = spConfig->ReadConfigValue("upload", "EachUploadLen", str);
 		if (Error == Error_Succeed) 
 		{    
-			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("[CenterUrl] EachUploadLen =%s",str.GetData());
+			DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM)("[CenterUrl] EachUploadLen =%s",str.GetData());
 			if(str.IsNullOrEmpty()){
 				m_eachUploadLen = UPLOAD_CONTENT_EACH_LEN;
 			}else{
@@ -864,7 +864,7 @@ ErrorCodeEnum UploadFSM::OnInit()
 		Error = spConfig->ReadConfigValueInt("upload", "UploadMaxNum", uploadMaxNum);
 		if (Error == Error_Succeed) 
 		{    
-			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("[CenterUrl] UploadMaxNum =%d",uploadMaxNum);
+			DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM)("[CenterUrl] UploadMaxNum =%d",uploadMaxNum);
 			if(uploadMaxNum<=10){
 				m_uploadMaxNum = 200;
 			}else{
@@ -889,7 +889,7 @@ ErrorCodeEnum UploadFSM::OnInit()
 #endif			
 				
 				m_rootPath = runPathStr.substr(0,pos);
-				DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("get rvc path is %s",m_rootPath.c_str());
+				//DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("get rvc path is %s",m_rootPath.c_str());
 			}else{
 				DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("get rvc path is null");
 				return Error_Unexpect;
@@ -1413,8 +1413,9 @@ bool UploadFSM::queryPlan()
 					m_uploadPlanList->push_back(p);
 				}
 				if(m_branchIpList.size()==0){
-					LogWarn(Severity_Middle, Error_Unexpect, LOG_WARN_UPLOAD_QUERY_PLAN_DATA_ERROR, CSimpleStringA::Format("queryPlan http req fail, return upload_url count is 0, url is %s",m_centerUrl.queryPlanUrl.c_str()).GetData());
-					return false;//上传服务ip为空，走旧模式
+					//LogWarn(Severity_Middle, Error_Unexpect, LOG_WARN_UPLOAD_QUERY_PLAN_DATA_ERROR, CSimpleStringA::Format("queryPlan http req fail, return upload_url count is 0, url is %s",m_centerUrl.queryPlanUrl.c_str()).GetData());
+					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("queryPlan http req fail, return upload_url count is 0, url is %s", m_centerUrl.queryPlanUrl.c_str());
+					return false;//上传服务ip为空
 				}
 				
 				if(m_uploadPlanList->size()==0){
@@ -1457,7 +1458,7 @@ void UploadFSM::scanFile()
 			continue;
 		}
 		if(m_printPlan){
-			DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("planID=[%s], scanDir=[%s], filter=[%s], file_limit=[%d], max_silent=[%d]",up->plan_id.c_str(),path.c_str(),up->file_name.c_str(),up->file_limit,up->max_silent);
+			DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("planID=[%s], scanDir=[%s], filter=[%s], file_limit=[%d], max_silent=[%d]",up->plan_id.c_str(),path.c_str(),up->file_name.c_str(),up->file_limit,up->max_silent);
 		}
 		scanDirfresh(up,path.c_str());
 	}
@@ -1876,14 +1877,13 @@ void UploadFSM::reportBatchMsg()
 			m_uploadReport.isBreak, m_uploadReport.sum, m_uploadReport.succ, m_uploadReport.fail, m_uploadReport.uploadFail, m_uploadReport.updateState,
 			m_uploadReport.operateFileFail, m_uploadReport.decodeFail, m_uploadReport.queryTempFail);
 		//LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_UPLOAD_FILE_REPORT, strReport.GetData());
-		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)(strReport.GetData());
+		//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)(strReport.GetData());
 	}else{
 		strReport =CSimpleStringA::Format("batch=fail isbreak=%d sum=%d succ=%d fail=%d detail fail: uploadFail=%d updateState=%d operateFileFail=%d (decodeFail=%d queryTempFail=%d)",
 			m_uploadReport.isBreak, m_uploadReport.sum, m_uploadReport.succ, m_uploadReport.fail, m_uploadReport.uploadFail, m_uploadReport.updateState,
 			m_uploadReport.operateFileFail, m_uploadReport.decodeFail, m_uploadReport.queryTempFail);
 		LogWarn(Severity_Middle, Error_Unexpect, LOG_WARN_UPLOAD_FILE_REPORT, strReport.GetData());
 	}
-	//LogWarn(Severity_Middle, Error_Unexpect, LOG_WARN_UPLOAD_FILE_REPORT, strReport.GetData());
 }
 
 bool UploadFSM::findOverLenWarn(const char* fileName) {

Module/mod_upload/Upload_client_g.h

@@ -58,202 +58,6 @@ public:
 		return Error;
 	}
 
-	ErrorCodeEnum UploadProgess(UploadService_UploadProgess_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(UploadService_Method_UploadProgess, UploadService_MethodSignature_UploadProgess, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum UploadProgess(UploadService_UploadProgess_Req &Req, UploadService_UploadProgess_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = UploadProgess(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum UploadProgess(UploadService_UploadProgess_Req &Req, UploadService_UploadProgess_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = UploadProgess(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum UploadProgess(UploadService_UploadProgess_Req &Req, UploadService_UploadProgess_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = UploadProgess(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum UploadNumber(UploadService_UploadNumber_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(UploadService_Method_UploadNumber, UploadService_MethodSignature_UploadNumber, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum UploadNumber(UploadService_UploadNumber_Req &Req, UploadService_UploadNumber_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = UploadNumber(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum UploadNumber(UploadService_UploadNumber_Req &Req, UploadService_UploadNumber_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = UploadNumber(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum UploadNumber(UploadService_UploadNumber_Req &Req, UploadService_UploadNumber_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = UploadNumber(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum UploadDateList(UploadService_UploadDateList_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(UploadService_Method_UploadDateList, UploadService_MethodSignature_UploadDateList, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum UploadDateList(UploadService_UploadDateList_Req &Req, UploadService_UploadDateList_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = UploadDateList(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum UploadDateList(UploadService_UploadDateList_Req &Req, UploadService_UploadDateList_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = UploadDateList(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum UploadDateList(UploadService_UploadDateList_Req &Req, UploadService_UploadDateList_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = UploadDateList(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum ClearUploadDate(UploadService_ClearUploadDate_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		if (m_context.checkEmpty())
-		{
-			m_context.AutoGenerate();
-			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
-			m_context = m_context.upgradeLink();
-		}
-		auto ret = pFunc->AsyncRequest(UploadService_Method_ClearUploadDate, UploadService_MethodSignature_ClearUploadDate, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum ClearUploadDate(UploadService_ClearUploadDate_Req &Req, UploadService_ClearUploadDate_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = ClearUploadDate(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum ClearUploadDate(UploadService_ClearUploadDate_Req &Req, UploadService_ClearUploadDate_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = ClearUploadDate(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum ClearUploadDate(UploadService_ClearUploadDate_Req &Req, UploadService_ClearUploadDate_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = ClearUploadDate(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			CSimpleString str;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
 
 	bool SafeDelete()
 	{

Module/mod_upload/Upload_def_g.h

@@ -12,104 +12,8 @@ namespace Upload {
 // const goes here
 //
 
-#define UploadService_Method_UploadProgess 0
-#define UploadService_Method_UploadNumber 1
-#define UploadService_Method_UploadDateList 2
-#define UploadService_Method_ClearUploadDate 3
 
-#define UploadService_MethodSignature_UploadProgess 1590024449
-#define UploadService_MethodSignature_UploadNumber 894683613
-#define UploadService_MethodSignature_UploadDateList -863824008
-#define UploadService_MethodSignature_ClearUploadDate -951120710
 
-#define UploadService_LogCode_UploadProgess "QLR040210400"
-#define UploadService_LogCode_UploadNumber "QLR040210401"
-#define UploadService_LogCode_UploadDateList "QLR040210402"
-#define UploadService_LogCode_ClearUploadDate "QLR040210403"
-
-struct UploadService_UploadProgess_Req
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
-struct UploadService_UploadProgess_Ans
-{
-	int uploadState;
-	int uploadNumber;
-	CSimpleStringW elapseTime;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & uploadState & uploadNumber & elapseTime;
-	}
-
-};
-
-struct UploadService_UploadNumber_Req
-{
-	int silentTime;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & silentTime;
-	}
-
-};
-
-struct UploadService_UploadNumber_Ans
-{
-	int uploadNumber;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & uploadNumber;
-	}
-
-};
-
-struct UploadService_UploadDateList_Req
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
-struct UploadService_UploadDateList_Ans
-{
-	CAutoArray<CSimpleStringA> uploadDateStr;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & uploadDateStr;
-	}
-
-};
-
-struct UploadService_ClearUploadDate_Req
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
-struct UploadService_ClearUploadDate_Ans
-{
-	bool isOK;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & isOK;
-	}
-
-};
 
 
 ///////////////////////////

Module/mod_upload/Upload_server_g.h

@@ -30,34 +30,6 @@ public:
 	{
 		ErrorCodeEnum Error = Error_Succeed;
 		switch (dwMessageID) {
-		case UploadService_Method_UploadProgess:
-			if (dwSignature == UploadService_MethodSignature_UploadProgess) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UploadService_Method_UploadNumber:
-			if (dwSignature == UploadService_MethodSignature_UploadNumber) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UploadService_Method_UploadDateList:
-			if (dwSignature == UploadService_MethodSignature_UploadDateList) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UploadService_Method_ClearUploadDate:
-			if (dwSignature == UploadService_MethodSignature_ClearUploadDate) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		default:
 			Error = Error_MethodNotFound;
 			break;
@@ -69,26 +41,6 @@ public:
 	{
 		ErrorCodeEnum Error = Error_Succeed;
 		switch (dwMessageID) {
-		case UploadService_Method_UploadProgess:
-			if (dwSignature != UploadService_MethodSignature_UploadProgess) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UploadService_Method_UploadNumber:
-			if (dwSignature != UploadService_MethodSignature_UploadNumber) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UploadService_Method_UploadDateList:
-			if (dwSignature != UploadService_MethodSignature_UploadDateList) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UploadService_Method_ClearUploadDate:
-			if (dwSignature != UploadService_MethodSignature_ClearUploadDate) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		default:
 			Error = Error_MethodNotFound;
 			break;
@@ -96,26 +48,6 @@ public:
 		return Error;
 	}
 
-	virtual void Handle_UploadProgess(SpReqAnsContext<UploadService_UploadProgess_Req, UploadService_UploadProgess_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_UploadNumber(SpReqAnsContext<UploadService_UploadNumber_Req, UploadService_UploadNumber_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_UploadDateList(SpReqAnsContext<UploadService_UploadDateList_Req, UploadService_UploadDateList_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_ClearUploadDate(SpReqAnsContext<UploadService_ClearUploadDate_Req, UploadService_ClearUploadDate_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
 	virtual void OnRequest(CSmartPointer<ITransactionContext> pTransactionContext)
 	{
 		CAutoBuffer Buf;
@@ -132,46 +64,6 @@ public:
 			}
 #endif
 			switch (dwMessageID) {
-				case UploadService_Method_UploadProgess:
-					{
-						SpReqAnsContext<UploadService_UploadProgess_Req,UploadService_UploadProgess_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<UploadService_UploadProgess_Req,UploadService_UploadProgess_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_UploadProgess(ctx);
-					}
-					break;
-				case UploadService_Method_UploadNumber:
-					{
-						SpReqAnsContext<UploadService_UploadNumber_Req,UploadService_UploadNumber_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<UploadService_UploadNumber_Req,UploadService_UploadNumber_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_UploadNumber(ctx);
-					}
-					break;
-				case UploadService_Method_UploadDateList:
-					{
-						SpReqAnsContext<UploadService_UploadDateList_Req,UploadService_UploadDateList_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<UploadService_UploadDateList_Req,UploadService_UploadDateList_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_UploadDateList(ctx);
-					}
-					break;
-				case UploadService_Method_ClearUploadDate:
-					{
-						SpReqAnsContext<UploadService_ClearUploadDate_Req,UploadService_ClearUploadDate_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<UploadService_ClearUploadDate_Req,UploadService_ClearUploadDate_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_ClearUploadDate(ctx);
-					}
-					break;
 				default:
 					assert(0);
 					break;

Module/mod_upload/mod_upload.cpp

@@ -1,39 +1,6 @@
 #include "stdafx.h"
 #include "mod_upload.h"
 
-
-
-void UploadSession::Handle_UploadProgess(SpReqAnsContext<UploadService_UploadProgess_Req, UploadService_UploadProgess_Ans>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI(__FUNCTION__)("UploadProgessReq received!");
-	ErrorCodeEnum returnCode = ((CUploadEntity*)m_pEntity)->UploadProgess(ctx);
-	ctx->Answer(returnCode);
-}
-void UploadSession::Handle_UploadNumber(SpReqAnsContext<UploadService_UploadNumber_Req, UploadService_UploadNumber_Ans>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI(__FUNCTION__)("UploadNumberReq received!");
-	ErrorCodeEnum returnCode = ((CUploadEntity*)m_pEntity)->UploadNumber(ctx);
-	ctx->Answer(returnCode);
-}
-void UploadSession::Handle_UploadDateList(SpReqAnsContext<UploadService_UploadDateList_Req, UploadService_UploadDateList_Ans>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI(__FUNCTION__)("UploadDateList received!");
-	ErrorCodeEnum returnCode = ((CUploadEntity*)m_pEntity)->UploadDateList(ctx);
-	ctx->Answer(returnCode);
-}
-void UploadSession::Handle_ClearUploadDate(SpReqAnsContext<UploadService_ClearUploadDate_Req, UploadService_ClearUploadDate_Ans>::Pointer ctx)
-{
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setAPI(__FUNCTION__)("ClearUploadDate received!");
-	ErrorCodeEnum returnCode = ((CUploadEntity*)m_pEntity)->ClearUploadDate(ctx);
-	ctx->Answer(returnCode);
-}
-
-
-
 SP_BEGIN_ENTITY_MAP()
 	SP_ENTITY(CUploadEntity)
 SP_END_ENTITY_MAP()

Module/mod_upload/mod_upload.h

@@ -23,11 +23,6 @@ public:
 	UploadSession(CUploadEntity* pEntity) : m_pEntity(pEntity) {}
 	virtual ~UploadSession() {}
 
-	virtual void Handle_UploadProgess(SpReqAnsContext<UploadService_UploadProgess_Req, UploadService_UploadProgess_Ans>::Pointer ctx);
-	virtual void Handle_UploadNumber(SpReqAnsContext<UploadService_UploadNumber_Req, UploadService_UploadNumber_Ans>::Pointer ctx);
-	virtual void Handle_UploadDateList(SpReqAnsContext<UploadService_UploadDateList_Req, UploadService_UploadDateList_Ans>::Pointer ctx);
-	virtual void Handle_ClearUploadDate(SpReqAnsContext<UploadService_ClearUploadDate_Req, UploadService_ClearUploadDate_Ans>::Pointer ctx);
-
 private:
 	CUploadEntity* m_pEntity;
 };
@@ -74,76 +69,6 @@ public:
 		return new UploadSession(this);
 	}
 
-	//查询当前上传进度
-	ErrorCodeEnum UploadProgess(SpReqAnsContext<UploadService_UploadProgess_Req, UploadService_UploadProgess_Ans>::Pointer ctx)
-	{
-		ErrorCodeEnum  ret = Error_Succeed;
-		//UploadProgress progress;
-
-		//m_fsm.getUploadProgress(progress);
-		//ctx->Ans.uploadState=progress.uploadState;
-		//ctx->Ans.uploadNumber=progress.uploadNumber;
-		//ctx->Ans.elapseTime=CSimpleStringA2W(progress.elapseTime);
-		//Dbg("UploadProgess: state %d uploadNumber %d elapseTime %s",progress.uploadState,progress.uploadNumber,progress.elapseTime.GetData());
-		ctx->Ans.uploadState = 2;
-		ctx->Ans.uploadNumber = 0;
-		ctx->Ans.elapseTime = CSimpleStringA2W("");
-		//Dbg("UploadProgess is disable");
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("UploadProgess is disable");
-		return ret;
-	}
-	//查询剩余待上传的文件个数
-	ErrorCodeEnum UploadNumber(SpReqAnsContext<UploadService_UploadNumber_Req, UploadService_UploadNumber_Ans>::Pointer ctx)
-	{
-		ErrorCodeEnum  ret = Error_Succeed;
-		//Dbg("UploadNumber req silentTime is %d",ctx->Req.silentTime);
-		//废弃接口
-		//int fileNum = m_fsm.getCheckDirFile(ctx->Req.silentTime);
-		//Dbg("UploadNumber is %d",fileNum);
-		//ctx->Ans.uploadNumber=fileNum;
-		ctx->Ans.uploadNumber = 0;
-		//Dbg("UploadNumber is disable");
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("UploadNumber is disable");
-		return ret;
-	}
-
-	//查询上传日期列表
-	ErrorCodeEnum UploadDateList(SpReqAnsContext<UploadService_UploadDateList_Req, UploadService_UploadDateList_Ans>::Pointer ctx)
-	{
-		ErrorCodeEnum  ret = Error_Succeed;
-
-		CAutoArray<CSimpleStringA> str;
-		//废弃接口
-		//ret = m_fsm.getUploadDate(str);
-		//if(ret==Error_Succeed){
-		//	ctx->Ans.uploadDateStr=str;
-		//}
-		ctx->Ans.uploadDateStr = str;
-		//Dbg("UploadDateList is disable");
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("UploadDateList is disable");
-		return ret;
-	}
-
-	//清空上传日期列表
-	ErrorCodeEnum ClearUploadDate(SpReqAnsContext<UploadService_ClearUploadDate_Req, UploadService_ClearUploadDate_Ans>::Pointer ctx)
-	{
-		ErrorCodeEnum  ret = Error_Succeed;
-		//废弃接口
-		//bool bret = m_fsm.clearUploadDate();
-		//if(bret){
-		//	ctx->Ans.isOK=true;
-		//}else{
-		//	ctx->Ans.isOK=false;
-		//}
-		//Dbg("ClearUploadDate is disable");
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("ClearUploadDate is disable");
-		ctx->Ans.isOK = true;
-		return ret;
-	}
-
-
-
-
 private:
 	UploadFSM m_fsm;
 };

Module/mod_upload/upload.cpp

@@ -1,12 +1,12 @@
 #include "stdafx.h"
 #include "SpBase.h"
-#include "SpIni.h"
+//#include "SpIni.h"
 #include "upload.h"
-#include <memutil.h>
+//#include <memutil.h>
 #include <fileutil.h>
-#include <array.h>
-#include <string>
-#include "sstream"
+//#include <array.h>
+//#include <string>
+//#include "sstream"
 #ifdef RVC_OS_WIN
 
 #include "XZip.h"
@@ -22,144 +22,6 @@
 
 
 using namespace std;
-//获取文件夹实际路径
-//static ErrorCodeEnum expand_dir(IEntityFunction *pEntityFunc, const char *str, CSimpleStringA &out)
-//{
-//	ErrorCodeEnum Error = Error_Unexpect;
-//	if (str) {
-//		const char *p = str;
-//		const char *sfirst;
-//		int first = 0;
-//		char tmp[1024];
-//		int k = 0;
-//		while (*p) {
-//			if (first) {
-//				if (*p == ')') {
-//					char key[MAX_PATH];
-//					key[0] = 0;
-//					CSimpleStringA strKeyPath;;
-//					memcpy(key, sfirst, p - sfirst);
-//					key[p-sfirst] = 0;
-//					Error = pEntityFunc->GetPath(key, strKeyPath);
-//					if (Error != Error_Succeed) {
-//						//Dbg("sys path $(%s)$ cannot evaluate!", key);
-//						DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI("expand_dir")("sys path $(%s)$ cannot evaluate!", key);
-//						return Error;
-//					}
-//					strcpy(&tmp[k], (LPCSTR)strKeyPath); 
-//					k += strKeyPath.GetLength();
-//					first = 0;
-//				}
-//			} else {
-//				if (*p == '$' && *(p+1) == '(') {
-//					p++;
-//					first = 1;
-//					sfirst = p+1;
-//				} else {
-//					tmp[k++] = *p;
-//				}
-//			}
-//			p++;
-//		}
-//		if (k != 0) {
-//			tmp[k] = 0;
-//			out = tmp;
-//			return Error_Succeed;
-//		}
-//	} else {
-//		return Error_Param;
-//	}
-//	return Error;
-//}
-
-//static upload_dir_t *upload_dir_load(IEntityFunction *pEntityFunc, const char *dir, int default_silent_time, int default_limitation)
-//{
-//	upload_dir_t *updir = ZALLOC_T(upload_dir_t);
-//	if (updir) 
-//	{
-//		CSimpleStringA str;
-//
-//		std::map<std::string, std::string> macroPath;
-//		macroPath["SysLog"] = "$(SysLog)"; //TODO
-//		macroPath["InterLog"] = "$(InterLog)"; //TODO
-//		macroPath["Photo"] = "$(UploadPhoto)";
-//		macroPath["Video"] = "$(UploadVideo)";
-//		macroPath["SilverlightDebug"] = "$(slv)"; //TODO
-//		macroPath["Debug"] = "$(dbg)";
-//
-//		std::map<std::string, bool> macroZip;
-//		macroZip["SysLog"] = true;
-//		macroZip["InterLog"] = true;
-//		macroZip["Photo"] = false;
-//		macroZip["Video"] = false;
-//		macroZip["SilverlightDebug"] = true;
-//		macroZip["Debug"] = true;
-//
-//		ErrorCodeEnum Error = Error_Succeed;
-//		if (macroPath.find(dir) == macroPath.end()) {
-//			return updir;
-//		}
-//		str = macroPath[dir].c_str();
-//
-//		INIT_LIST_HEAD(&updir->candidate_list);
-//		CSimpleStringA strRealPath;
-//		Error = expand_dir(pEntityFunc, (LPCSTR)str, strRealPath);
-//		if (Error == Error_Succeed) {
-//			INIT_LIST_HEAD(&updir->candidate_list);
-//			updir->name = _strdup(dir);
-//			updir->path = _strdup(strRealPath);
-//
-//			if (strcmp(dir, "Video") == 0) {
-//				str = "$(LocalVideo)";
-//				updir->flags |= UPLOAD_FLAG_MOVEPATH;
-//				Error = expand_dir(pEntityFunc, str, strRealPath);
-//				if (Error != Error_Succeed) {
-//					return NULL;
-//				}
-//				updir->movepath = _strdup(strRealPath);
-//			} else {
-//				updir->flags |= UPLOAD_FLAG_AUTODELETE;
-//			}
-//			if (macroZip.find(dir) != macroZip.end() && macroZip[dir]) {
-//				updir->flags |= UPLOAD_FLAG_ZIP;
-//			}
-//			if (strcmp("SilverlightDebug", dir) == 0 || strcmp("Debug", dir) == 0) {
-//				updir->silent_time = 86400;
-//			} else {
-//				updir->silent_time = 900;
-//			}
-//			updir->child_count_limitation = default_limitation;
-//			updir->fileCount = 0;//初始化设置为0
-//			updir->fileLenSum = 0;//初始化设置为0
-//		}
-//	}
-//	return updir;
-//}
-
-//初始化要上传的文件夹配置
-//int upload_create(struct list_head *list, IEntityFunction *pEntityFunc, CSimpleStringA &checkDir)
-//{
-//	assert(list_empty(list));
-//	char type_str[1024];
-//	char *p, *c;
-//	int default_silent_time = 3600;
-//	int default_limitation = 256;
-//	strcpy(type_str, "SysLog,InterLog,Photo,Video,SilverlightDebug,Debug");
-//	p = strtok_s(type_str, ", ", &c);
-//	while (p) {
-//		upload_dir_t *dir = upload_dir_load(pEntityFunc, p, default_silent_time, default_limitation);
-//		if (!dir) 
-//		{
-//			return Error_Unexpect;
-//		}
-//		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI("upload_create")("load %s ok", p);
-//		list_add_tail(&dir->entry, list);
-//		p = strtok_s(NULL, ", ", &c);
-//	}
-//	return 0;
-//}
-
-
 
 #ifdef RVC_OS_WIN
 #define FT_2000_1_1_0_0_0	125911584000000000UL
@@ -169,46 +31,6 @@ using namespace std;
 
 #endif // RVC_OS_WIN
 
-static int check_zero_ref(const char *path)
-{
-#ifdef RVC_OS_WIN
-	HANDLE hFile = CreateFileA(path,
-		GENERIC_READ, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); // try open
-	if (hFile != INVALID_HANDLE_VALUE) {
-		CloseHandle(hFile);
-		return TRUE;
-	}
-	else {
-        //LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_UPLOAD_SCANFILE_LOCK_ERROR, CSimpleStringA::Format("check_zero_ref is fail:%s",path).GetData());
-		DWORD dwRet = GetLastError();
-		return FALSE;
-	}
-#else
-	//后期改为linux真正的文件锁，现在来看，暂时用不着
-	FILE* fp = fopen(path, "rb");
-	if (fp != NULL) {
-		fclose(fp);
-		return true;
-	}
-	else
-	{
-	    //Dbg("try open file fail :%s",path);
-		//LogWarn(Severity_Low, Error_Unexpect, LOG_WARN_UPLOAD_SCANFILE_LOCK_ERROR, CSimpleStringA::Format("check_zero_ref is fail:%s",path).GetData());
-		return false;
-	}
-#endif // RVC_OS_WIN
-}
-
-
-
-
-
-
-	
-
-
-
-
 
 #ifdef RVC_OS_WIN
 

Module/mod_upload/upload.h

@@ -13,40 +13,6 @@
 #include <iostream>
 #endif
 
-typedef struct file_t file_t;
-typedef struct upload_dir_t upload_dir_t;
-
-struct file_t 
-{
-	struct list_head entry;
-	char *path;
-	char *name;
-	unsigned int create_time;//距离2000年1月1日的流逝的秒数
-	unsigned int length;
-	upload_dir_t *owner;
-};
-
-#define UPLOAD_FLAG_AUTODELETE	0x01
-#define UPLOAD_FLAG_MOVEPATH	0x02
-#define UPLOAD_FLAG_ZIP			0x04
-
-// from ini config
-struct upload_dir_t {
-	struct list_head entry;
-	char *name;
-	char *path;
-	int flags;//自动删除|移动|压缩
-	char *movepath;	
-	struct list_head candidate_list;//需要上传文件的集合
-	int silent_time; // sec
-	int child_count_limitation;
-	int fileCount;//增加lwt 当前文件的个数
-	int fileLenSum;//文件总长度 单位是k
-};
-
-
-
-
 #ifdef RVC_OS_WIN
 
 #else