Merge pull request #14 from libxengine/develop

V3.0 Merge

Author: xengine-qyt

XEngine_APPClient/APPClient_Download/APPClient_Download.cpp

@@ -21,6 +21,7 @@
 #include <XEngine_Include/XEngine_SystemSdk/ProcFile_Define.h>
 #include <XEngine_Include/XEngine_SystemSdk/SystemApi_Define.h>
 #include <XEngine_Include/XEngine_SystemSdk/SystemApi_Error.h>
+#include "../../XEngine_Source/XStorage_Protocol.h"
 using namespace std;
 
 #pragma comment(lib,"x86/XEngine_BaseLib/XEngine_BaseLib")
@@ -31,7 +32,7 @@ using namespace std;
 
 typedef struct 
 {
-	XENGINE_PROTOCOLFILE st_ProtocolFile;
+	XENGINE_PROTOCOL_FILE st_ProtocolFile;
 	CHAR tszIPAddr[64];                                     
 }P2PFILE_INFO;
 

XEngine_Docment/Docment_en.docx

@@ -39,7 +39,7 @@
     "bResumable": 1,
     "nHashMode": 2,
     "bRename": 0,
-    "tszFileDir": "./XEngine_File"
+    "tszFileDir": "/home/ubuntu/桌面/XEngine_Storage/XEngine_Source/Debug/XEngine_File"
   },
   "XProxy": {
     "XProxyAuth": {
@@ -68,6 +68,7 @@
   },
   "XVer": {
     "StorageVersion": [
+      "3.0.0.1001 Build20211029",
       "2.5.0.1001 Build20210930",
       "2.4.0.1001 Build20210918",
       "2.3.0.1001 Build20210903",
@@ -82,4 +83,4 @@
       "1.0.0.1001 Build20210501"
     ]
   }
-}
+}

XEngine_Docment/Docment_zh.docx

@@ -4,41 +4,36 @@ UNICODE = 0
 FLAGS = RELEASE=$(RELEASE)
 
 STORAGE_SQL_PATH = ./XEngine_StorageComponents/XStorage_SQLPacket
-STORAGE_PROTOCOL_PATH = ./XEngine_StorageComponents/XStorage_Protocol
-P2XP_PEER_PATH = ./XEngine_P2XPComponents/XEngine_P2XPPeer
-P2XP_PROTOCOL_PATH = ./XEngine_P2XPComponents/XEngine_P2XPProtocol
+STORAGE_P2XP_PATH = ./XEngine_StorageComponents/XStorage_P2XPPeer
 
 BASE_CONFIG_PATH = ./StorageModule_Config
 BASE_SESSION_PATH = ./StorageModule_Session
 BASE_APIHELP_PATH = ./StorageModule_APIHelp
+BASE_PROTOCOL_PATH = ./StorageModule_Protocol
 
 APPSERVICE_STORAGE_PATH = ./XEngine_StorageApp
 
-NETENGINE_LIB = libXStorage_SQLPacket.so libXStorage_Protocol.so                       \
-                libXEngine_P2XPPeer.so libXEngine_P2XPProtocol.so                      \
-                libStorageModule_Config.so libStorageModule_Session.so libStorageModule_APIHelp.so                 \
+NETENGINE_LIB = libXStorage_SQLPacket.so libXStorage_P2XPPeer.so                       \
+                libStorageModule_Config.so libStorageModule_Session.so libStorageModule_APIHelp.so libStorageModule_Protocol.so         \
 		 XEngine_StorageApp.exe 
 
 .PHONY:MakeAll 
 MakeAll:$(NETENGINE_LIB)
 
 libXStorage_SQLPacket.so:
 	make -C $(STORAGE_SQL_PATH) $(FLAGS)
-libXStorage_Protocol.so:
-	make -C $(STORAGE_PROTOCOL_PATH) $(FLAGS)
+libXStorage_P2XPPeer.so:
+	make -C $(STORAGE_P2XP_PATH) $(FLAGS)
 
-libXEngine_P2XPPeer.so:
-	make -C $(P2XP_PEER_PATH) $(FLAGS)
-libXEngine_P2XPProtocol.so:
-	make -C $(P2XP_PROTOCOL_PATH) $(FLAGS)
-	
 libStorageModule_Config.so:
 	make -C $(BASE_CONFIG_PATH) $(FLAGS)
 libStorageModule_Session.so:
 	make -C $(BASE_SESSION_PATH) $(FLAGS)
 libStorageModule_APIHelp.so:
 	make -C $(BASE_APIHELP_PATH) $(FLAGS)
-
+libStorageModule_Protocol.so:
+	make -C $(BASE_PROTOCOL_PATH) $(FLAGS)
+	
 XEngine_StorageApp.exe:
 	make -C $(APPSERVICE_STORAGE_PATH) $(FLAGS)
 
@@ -50,6 +45,3 @@ InstallAll:SetFlags_Install $(NETENGINE_LIB)
 SetFlags_Clean:
 	export FLAGS=CleanAll
 CleanAll:SetFlags_Clean $(NETENGINE_LIB) 
-	
-	
-	

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -59,7 +59,7 @@ extern "C" BOOL APIHelp_Distributed_IsMode(list<int>*pStl_ListMode, int nMode);
   意思：是否成功
 备注：
 *********************************************************************/
-extern "C" BOOL APIHelp_Distributed_RandomAddr(list<tstring>* pStl_ListAddr, TCHAR* ptszAddr);
+extern "C" BOOL APIHelp_Distributed_RandomAddr(list<string>* pStl_ListAddr, TCHAR* ptszAddr);
 /********************************************************************
 函数名称：APIHelp_Distributed_FileList
 函数功能：解析所有解析到的内容并且打包成指定结构

XEngine_Source/Makefile

@@ -74,7 +74,7 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_IsMode(list<int>* pStl_ListMode,
   意思：是否成功
 备注：
 *********************************************************************/
-BOOL CAPIHelp_Distributed::APIHelp_Distributed_RandomAddr(list<tstring>* pStl_ListAddr, TCHAR* ptszAddr)
+BOOL CAPIHelp_Distributed::APIHelp_Distributed_RandomAddr(list<string>* pStl_ListAddr, TCHAR* ptszAddr)
 {
 	APIHelp_IsErrorOccur = FALSE;
 
@@ -86,7 +86,7 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_RandomAddr(list<tstring>* pStl_Li
 	{
 		xhToken--;
 	}
-	list<tstring>::const_iterator stl_ListIterator = pStl_ListAddr->begin();
+	list<string>::const_iterator stl_ListIterator = pStl_ListAddr->begin();
 	for (XNETHANDLE i = 0; stl_ListIterator != pStl_ListAddr->end(); stl_ListIterator++, i++)
 	{
 		if (xhToken == i)

XEngine_Source/StorageModule_APIHelp/APIHelp_Define.h

@@ -19,7 +19,7 @@ class CAPIHelp_Distributed
 	~CAPIHelp_Distributed();
 public:
 	BOOL APIHelp_Distributed_IsMode(list<int>* pStl_ListMode, int nMode);
-	BOOL APIHelp_Distributed_RandomAddr(list<tstring>* pStl_ListAddr, TCHAR* ptszAddr);
+	BOOL APIHelp_Distributed_RandomAddr(list<string>* pStl_ListAddr, TCHAR* ptszAddr);
 	BOOL APIHelp_Distributed_FileList(list<APIHELP_LBFILEINFO>* pStl_ListParse, XSTORAGECORE_DBFILE*** pppSt_ListPacket, int* pInt_ListCount);
 protected:
 	BOOL APIHelp_Distributed_FileListParse(LPCTSTR lpszMsgBuffer, int nMsgLen, XSTORAGECORE_DBFILE* pSt_DBFile);

XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.cpp

@@ -33,7 +33,7 @@ extern "C" BOOL APIHelp_Distributed_IsMode(list<int>*pStl_ListMode, int nMode)
 {
 	return m_APIDistributed.APIHelp_Distributed_IsMode(pStl_ListMode, nMode);
 }
-extern "C" BOOL APIHelp_Distributed_RandomAddr(list<tstring>*pStl_ListAddr, TCHAR * ptszAddr)
+extern "C" BOOL APIHelp_Distributed_RandomAddr(list<string>*pStl_ListAddr, TCHAR * ptszAddr)
 {
 	return m_APIDistributed.APIHelp_Distributed_RandomAddr(pStl_ListAddr, ptszAddr);
 }

XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.h

@@ -32,13 +32,7 @@ using namespace std;
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
 #include <XEngine_Include/XEngine_HelpComponents/DataBase_Define.h>
 #include <XEngine_Include/XEngine_HelpComponents/DataBase_Error.h>
-
-#ifdef _UNICODE
-typedef std::wstring tstring;
-#else
-typedef std::string tstring;
-#endif
-
+#include "../XStorage_Protocol.h"
 #include "../XEngine_StorageComponents/XStorage_SQLPacket/SQLPacket_Define.h"
 #include "APIHelp_Define.h"
 #include "APIHelp_Error.h"