added hash value for proxy pass

Author: xengine-qyt

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -1,9 +1,9 @@
 {
   "tszIPAddr": "127.0.0.1",
   "bDeamon": 0,
-  "nCenterPort": 5000,
-  "nStorageDLPort": 5001,
-  "nStorageUPPort": 5002,
+  "nCenterPort": 5100,
+  "nStorageDLPort": 5101,
+  "nStorageUPPort": 5102,
   "XMax": {
     "MaxClient": 10000,
     "MaxQueue": 10000,
@@ -45,10 +45,10 @@
       "tszAuthProxy": ""
     },
     "XProxyPass": {
-      "bUPGet": 0,
-      "bDLGet": 0,
-      "tszUPPass": "http://192.168.1.7/Api/Pass/upfile",
-      "tszDLPass": "http://192.168.1.7/Api/Pass/dlfile"
+      "bUPGet": 1,
+      "bDLGet": 1,
+      "tszUPPass": "http://192.168.1.9:5010/Api/Pass/upfile",
+      "tszDLPass": "http://192.168.1.9:5010/Api/Pass/dlfile"
     }
   },
   "XLimit": {
@@ -57,6 +57,7 @@
   },
   "XVer": {
     "StorageVersion": [
+      "1.4.0.1001 Build20210702",
       "1.3.0.1001 Build20210625",
       "1.2.0.1001 Build20210618",
       "1.1.0.1001 Build20210611",

XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp

@@ -68,14 +68,21 @@ XHTHREAD CALLBACK XEngine_Download_SendThread(LPVOID lParam)
 				{
 					int nPLen = MAX_PATH;
 					int nHttpCode = 0;
+					UCHAR tszHashKey[MAX_PATH];
+					TCHAR tszHashStr[MAX_PATH];
 					TCHAR tszProxyStr[MAX_PATH];
 					SESSION_STORAGEINFO st_StorageInfo;
 
+					memset(tszHashKey, '\0', MAX_PATH);
+					memset(tszHashStr, '\0', MAX_PATH);
 					memset(tszProxyStr, '\0', MAX_PATH);
 					memset(&st_StorageInfo, '\0', sizeof(SESSION_STORAGEINFO));
 
+					OPenSsl_Api_Digest(st_StorageInfo.tszFileDir, tszHashKey, NULL, TRUE, st_ServiceCfg.st_XStorage.nHashMode);
+					BaseLib_OperatorString_StrToHex((char*)tszHashStr, 20, tszHashStr);
 					Session_DLStroage_GetInfo(nThreadPos, i, &st_StorageInfo);
-					XStorageProtocol_Proxy_PacketUPDown(st_StorageInfo.tszFileDir, st_StorageInfo.tszClientAddr, st_StorageInfo.ullRWCount, tszProxyStr, &nPLen);
+
+					XStorageProtocol_Proxy_PacketUPDown(st_StorageInfo.tszFileDir, st_StorageInfo.tszClientAddr, st_StorageInfo.ullRWCount, tszProxyStr, &nPLen, tszHashStr);
 					APIHelp_HttpRequest_Post(st_ServiceCfg.st_XProxy.st_XProxyPass.tszDLPass, tszProxyStr, &nHttpCode);
 					XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_NOTICE, _T("下载客户端:%s,请求完成通知返回值:%d,文件:%s,地址:%s"), tszClientAddr, nHttpCode, st_StorageInfo.tszFileDir, st_ServiceCfg.st_XProxy.st_XProxyPass.tszDLPass);
 				}

XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp

@@ -146,7 +146,7 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
 					memset(&st_StorageInfo, '\0', sizeof(SESSION_STORAGEINFO));
 
 					Session_UPStroage_GetInfo(lpszClientAddr, &st_StorageInfo);
-					XStorageProtocol_Proxy_PacketUPDown(st_StorageInfo.tszFileDir, st_StorageInfo.tszClientAddr, st_StorageInfo.ullRWCount, tszProxyStr, &nPLen);
+					XStorageProtocol_Proxy_PacketUPDown(st_StorageInfo.tszFileDir, st_StorageInfo.tszClientAddr, st_StorageInfo.ullRWCount, tszProxyStr, &nPLen, st_ProtocolFile.st_ProtocolFile.tszFileHash);
 					APIHelp_HttpRequest_Post(st_ServiceCfg.st_XProxy.st_XProxyPass.tszUPPass, tszProxyStr, &nHttpCode);
 					XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_NOTICE, _T("上传客户端:%s,请求完成通知返回值:%d,文件:%s,地址:%s"), lpszClientAddr, nHttpCode, st_StorageInfo.tszFileDir, st_ServiceCfg.st_XProxy.st_XProxyPass.tszUPPass);
 				}