fixed:cal file hash value is corrent

Author: xengine-qyt

XEngine_Source/StorageModule_Session/Session_Define.h

@@ -422,4 +422,18 @@ extern "C" BOOL Session_UPStorage_GetAll(SESSION_STORAGEINFO*** pppSt_StorageInf
   意思：是否成功
 备注：
 *********************************************************************/
-extern "C" BOOL Session_UPStroage_Delete(LPCTSTR lpszClientAddr);
+extern "C" BOOL Session_UPStroage_Delete(LPCTSTR lpszClientAddr);
+/********************************************************************
+函数名称：Session_UPStroage_Close
+函数功能：关闭读写文件句柄
+ 参数.一：lpszClientAddr
+  In/Out：In
+  类型：常量字符指针
+  可空：N
+  意思：要关闭的客户端会话
+返回值
+  类型：逻辑型
+  意思：是否成功
+备注：
+*********************************************************************/
+extern "C" BOOL Session_UPStroage_Close(LPCTSTR lpszClientAddr);

XEngine_Source/StorageModule_Session/Session_Stroage/Session_UPStroage.cpp

@@ -384,4 +384,33 @@ BOOL CSession_UPStroage::Session_UPStroage_Delete(LPCTSTR lpszClientAddr)
 	}
 	st_Locker.unlock();
 	return TRUE;
+}
+/********************************************************************
+函数名称：Session_UPStroage_Close
+函数功能：关闭读写文件句柄
+ 参数.一：lpszClientAddr
+  In/Out：In
+  类型：常量字符指针
+  可空：N
+  意思：要关闭的客户端会话
+返回值
+  类型：逻辑型
+  意思：是否成功
+备注：
+*********************************************************************/
+BOOL CSession_UPStroage::Session_UPStroage_Close(LPCTSTR lpszClientAddr)
+{
+	Session_IsErrorOccur = FALSE;
+
+	st_Locker.lock_shared();
+	unordered_map<string, SESSION_STORAGEUPLOADER>::iterator stl_MapIterator = stl_MapStroage.find(lpszClientAddr);
+	if (stl_MapIterator != stl_MapStroage.end())
+	{
+		if (NULL != stl_MapIterator->second.st_StorageInfo.pSt_File)
+		{
+			fclose(stl_MapIterator->second.st_StorageInfo.pSt_File);
+		}
+	}
+	st_Locker.unlock_shared();
+	return TRUE;
 }

XEngine_Source/StorageModule_Session/Session_Stroage/Session_UPStroage.h

@@ -30,6 +30,7 @@ class CSession_UPStroage
     BOOL Session_UPStroage_Exist(LPCTSTR lpszClientAddr);
     BOOL Session_UPStorage_GetAll(SESSION_STORAGEINFO*** pppSt_StorageInfo, int* pInt_ListCount);
     BOOL Session_UPStroage_Delete(LPCTSTR lpszClientAddr);
+    BOOL Session_UPStroage_Close(LPCTSTR lpszClientAddr);
 private:
     BOOL m_bResume;
 private:

XEngine_Source/StorageModule_Session/StorageModule_Session.def

@@ -24,4 +24,5 @@ EXPORTS
 	Session_UPStroage_Write
 	Session_UPStroage_Exist
 	Session_UPStorage_GetAll
-	Session_UPStroage_Delete
+	Session_UPStroage_Delete
+	Session_UPStroage_Close

XEngine_Source/StorageModule_Session/pch.cpp

@@ -115,4 +115,8 @@ extern "C" BOOL Session_UPStorage_GetAll(SESSION_STORAGEINFO * **pppSt_StorageIn
 extern "C" BOOL Session_UPStroage_Delete(LPCTSTR lpszClientAddr)
 {
 	return m_UPStorage.Session_UPStroage_Delete(lpszClientAddr);
+}
+extern "C" BOOL Session_UPStroage_Close(LPCTSTR lpszClientAddr)
+{
+	return m_UPStorage.Session_UPStroage_Close(lpszClientAddr);
 }

XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp

@@ -266,7 +266,8 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
 		_tcscpy(st_ProtocolFile.st_ProtocolFile.tszFileName, tszFileName);
 		_tcscpy(st_ProtocolFile.tszBuckKey, st_StorageBucket.tszBuckKey);
 		st_ProtocolFile.st_ProtocolFile.nFileSize = st_StorageInfo.ullRWLen;
-
+		//上传完毕需要关闭,否则计算HASH会不正常
+		Session_UPStroage_Close(lpszClientAddr);
 		OPenSsl_Api_Digest(tszFileDir, tszHashStr, &nHashLen, TRUE, st_ServiceCfg.st_XStorage.nHashMode);
 		BaseLib_OperatorString_StrToHex((char*)tszHashStr, nHashLen, st_ProtocolFile.st_ProtocolFile.tszFileHash);
 		//处理结果