added:webdav verification configure

Author: xengine-qyt

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -45,9 +45,12 @@
     "XProxy": {
         "bUPPass": false,
         "bDLPass": false,
+        "bWDPass": false,
         "bAuthPass": false,
+        "nVType": 1,
         "tszUPPass": "http://192.168.1.7:5200/Api/Pass/UPFile",
         "tszDLPass": "http://192.168.1.7:5200/Api/Pass/UPFile",
+        "tszWDPass": "http://192.168.1.7:5200/Api/Pass/WDFile",
         "tszAuthPass": ""
     },
     "XLimit": {
@@ -68,7 +71,6 @@
         "bUPEnable": false,
         "bCHEnable": false,
         "bWDEnable": false,
-        "nVType": 1,
         "tszCertChain": "./XEngine_Cert/server.crt",
         "tszCertServer": "",
         "tszCertKey": "./XEngine_Cert/server.key"

XEngine_Source/StorageModule_Config/Config_Define.h

@@ -73,10 +73,12 @@ typedef struct tag_XEngine_ServerConfig
     {
 		bool bUPPass;
 		bool bDLPass;
+        bool bWDPass;
         bool bAuthPass;
         int nVType;
 		XCHAR tszUPPass[XPATH_MAX];
 		XCHAR tszDLPass[XPATH_MAX];
+        XCHAR tszWDPass[XPATH_MAX];
         XCHAR tszAuthPass[XPATH_MAX];
     }st_XProxy;
 	struct

XEngine_Source/StorageModule_Config/Config_Json/Config_Json.cpp

@@ -147,7 +147,7 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG
 	pSt_ServerConfig->st_XStorage.bResumable = st_JsonXStorage["bResumable"].asBool();
 	pSt_ServerConfig->st_XStorage.bWDLocation = st_JsonXStorage["bWDLocation"].asBool();
 
-	if (st_JsonRoot["XProxy"].empty() || (7 != st_JsonRoot["XProxy"].size()))
+	if (st_JsonRoot["XProxy"].empty() || (9 != st_JsonRoot["XProxy"].size()))
 	{
 		Config_IsErrorOccur = true;
 		Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_XPROXY;
@@ -156,10 +156,12 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG
 	Json::Value st_JsonXProxy = st_JsonRoot["XProxy"];
 	pSt_ServerConfig->st_XProxy.bDLPass = st_JsonXProxy["bDLPass"].asBool();
 	pSt_ServerConfig->st_XProxy.bUPPass = st_JsonXProxy["bUPPass"].asBool();
+	pSt_ServerConfig->st_XProxy.bWDPass = st_JsonXProxy["bWDPass"].asBool();
 	pSt_ServerConfig->st_XProxy.bAuthPass = st_JsonXProxy["bAuthPass"].asBool();
 	pSt_ServerConfig->st_XProxy.nVType = st_JsonXProxy["nVType"].asInt();
 	_tcsxcpy(pSt_ServerConfig->st_XProxy.tszDLPass, st_JsonXProxy["tszDLPass"].asCString());
 	_tcsxcpy(pSt_ServerConfig->st_XProxy.tszUPPass, st_JsonXProxy["tszUPPass"].asCString());
+	_tcsxcpy(pSt_ServerConfig->st_XProxy.tszWDPass, st_JsonXProxy["tszWDPass"].asCString());
 	_tcsxcpy(pSt_ServerConfig->st_XProxy.tszAuthPass, st_JsonXProxy["tszAuthPass"].asCString());
 
 	if (st_JsonRoot["XLimit"].empty() || (5 != st_JsonRoot["XLimit"].size()))

XEngine_Source/XEngine_StorageApp/StorageApp_Webdav.cpp

@@ -62,7 +62,7 @@ bool XEngine_Task_HttpWebdav(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 	st_HDRParam.nHttpCode = 200;
 	_tcsxcpy(st_HDRParam.tszMimeType, _X("xml"));
 
-	if (st_ServiceCfg.st_XProxy.bAuthPass)
+	if (st_ServiceCfg.st_XProxy.bWDPass)
 	{
 		int nVType = 0;
 		RFCCOMPONENTS_HTTP_HDRPARAM st_HDRParam = {};
@@ -105,13 +105,13 @@ bool XEngine_Task_HttpWebdav(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 		XCLIENT_APIHTTP st_APIHttp = {};
 
 		XCHAR* ptszMSGBuffer = NULL;
-		if (!APIClient_Http_Request(_X("GET"), st_ServiceCfg.st_XProxy.tszAuthPass, NULL, &nHTTPCode, &ptszMSGBuffer, &nMSGLen, NULL, NULL, &st_APIHttp))
+		if (!APIClient_Http_Request(_X("GET"), st_ServiceCfg.st_XProxy.tszWDPass, NULL, &nHTTPCode, &ptszMSGBuffer, &nMSGLen, NULL, NULL, &st_APIHttp))
 		{
 			st_HDRParam.nHttpCode = 500;
 			Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_SERVERDOWN, "api server is down,cant verification");
 			HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen, tszHDRBuffer);
 			XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPWEBDAV);
-			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("WEBDAV客户端:%s,用户验证失败,GET请求验证服务:%s 失败,错误码:%lX"), lpszClientAddr, st_ServiceCfg.st_XProxy.tszAuthPass, APIClient_GetLastError());
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("WEBDAV客户端:%s,用户验证失败,GET请求验证服务:%s 失败,错误码:%lX"), lpszClientAddr, st_ServiceCfg.st_XProxy.tszWDPass, APIClient_GetLastError());
 			return false;
 		}
 		if (200 != nHTTPCode)
@@ -120,7 +120,7 @@ bool XEngine_Task_HttpWebdav(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 			Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_SERVERDOWN, "api server is down,cant verification");
 			HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen, tszHDRBuffer);
 			XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPWEBDAV);
-			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("WEBDAV客户端:%s,用户验证失败,GET请求验证服务:%s 失败,错误:%d"), lpszClientAddr, st_ServiceCfg.st_XProxy.tszAuthPass, nHTTPCode);
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("WEBDAV客户端:%s,用户验证失败,GET请求验证服务:%s 失败,错误:%d"), lpszClientAddr, st_ServiceCfg.st_XProxy.tszWDPass, nHTTPCode);
 			return false;
 		}
 		XENGINE_PROTOCOL_USERAUTH st_UserAuth = {};