Merge pull request #7 from libxengine/develop

V1.5版本代码合并请求

Author: xengine-qyt

README.en.md

@@ -12,19 +12,21 @@ The purpose of development and implementation based on libXEngine is a cross-pla
 This repository has a development and master branch. If you want to use it, please use the master branch  
 
 feature list:  
-  1. support file http upload and download(use put and get method)  
-  2. support http api notify of event and management api interface  
-  3. support http encrypt and cert data transimission(planning)  
-  4. support mysql record infomation.  
-  5. support load banace(planning)  
-  6. supprot http auth  
-  7. support log and config  
-  8. supprot speeds contral  
-  9. supprot task start and end proxy forwarding    
-10.support p2p,bt and many more(planning)  
-11.support second pass  
-12.support nginx upload module proxy_pass  
-13.support upload and download Redirect  
+1. support file http upload and download(use put and get method)  
+2. support http api notify of event and management api interface  
+3. support http encrypt and cert data transimission(planning)  
+4. support database(mysql and sqlite) record infomation.  
+5. support load banace  
+6. supprot http auth  
+7. support log and config  
+8. supprot speeds contral  
+9. supprot task start and end proxy forwarding  
+10. support p2p  
+11. bt(planning)  
+12. data distributed(planning)  
+13. support second pass  
+14. support nginx upload module proxy_pass  
+15. support upload and download Redirect  
 
 ## install
 
@@ -85,7 +87,11 @@ The realization of downloading second transmission is to first query the local f
 ## directory struct
 - XEngine_Docment  docment directory
 - XEngine_Release  install directory
-- XEngine_Source   code    directory
+- XEngine_Source   code    directory  
+- XEngine_APPClient client code dir  
+
+## now task
+P2P
 
 ## other problems   
 You can refer to the document under the docment directory. It contains API protocol and service description.  

README.md

@@ -11,19 +11,21 @@ c c++ file storage service
 基于libXEngine开发并实现的一套简洁高性能跨平台网络存储服务  
 本仓库有开发和主分支,如果要使用,请使用master分支下的代码  
 软件特性:  
-  1. 支持HTTP协议上传和下载(采用PUT和GET)  
-  2. 支持HTTP API接口事件通知与管理  
-  3. 支持HTTP加密与证书(规划中)  
-  4. 采用MYSQL记录信息  
-  5. 支持分布式(规划中)  
-  6. 支持HTTP验证  
-  7. 支持详尽的日志和配置信息  
-  8. 支持传输速率控制
-  9. 支持任务开始结束代理转发  
-10.支持P2P,BT,数据分发(规划中)    
-11.支持秒传    
-12.支持NGINX UPLOAD MODULE上传代理  
-13.支持上传和下载重定向  
+1. 支持HTTP协议上传和下载(采用PUT和GET)  
+2. 支持HTTP API接口事件通知与管理  
+3. 支持HTTP加密与证书(规划中)  
+4. 采用数据库(MYSQL和SQLITE)记录信息  
+5. 支持分布式  
+6. 支持HTTP验证  
+7. 支持详尽的日志和配置信息  
+8. 支持传输速率控制
+9. 支持任务开始结束代理转发  
+10. 支持P2P  
+11. BT(规划中)  
+12. 数据分发(规划中)  
+13. 支持秒传  
+14. 支持NGINX UPLOAD MODULE上传代理  
+15. 支持上传和下载重定向  
 
 ## 安装教程
 
@@ -75,16 +77,20 @@ make FLAGS=CleanAll 清理编译
 6.  通过curl或postman 等三方工具测试上传下载
 
 ## 目录结构
-- XEngine_Docment  文档目录结构  
-- XEngine_Release  安装目录结构  
-- XEngine_Source   源代目录结构  
+- XEngine_Docment    文档目录结构  
+- XEngine_Release    安装目录结构  
+- XEngine_Source     源代目录结构  
+- XEngine_APPClient  客户端演示代码  
 
 
 ## 秒传实现  
 秒传的实现不是靠服务器实现的,而是靠客户端实现的.  
 上传秒传的实现是先通过HASH查询文件是否在服务器,如果存在就不上传直接提示客户端上传成功.  
 下载秒传的实现是先通过HASH查询本地文件保存路径,如果存在就直接下载完成.  
 
+## 当前任务
+实现P2P
+
 ## 其他问题  
 你可以参考docment目录下的文档.里面包含了API协议和服务说明.
 

XEngine_Docment/Docment_en.docx

@@ -25,17 +25,16 @@
     "LogLeave": 32
   },
   "XSql": {
+    "SQLType": 0,
+    "SQLFile": "./XEngine_SQL/SQLFile.db",
     "SQLAddr": "192.168.1.9",
     "SQLPort": 3306,
     "SQLUser": "root",
     "SQLPass": "123123Ruiyue"
   },
   "XStorage": {
-    "nUseMode": 0,
     "nHashMode": 2,
     "bRename": 0,
-    "tszHttpAddr": "http://192.168.1.9",
-    "tszNginAddr": "http://192.168.1.9:5010",
     "tszFileDir": "./XEngine_File"
   },
   "XProxy": {
@@ -45,8 +44,8 @@
       "tszAuthProxy": ""
     },
     "XProxyPass": {
-      "bUPGet": 1,
-      "bDLGet": 1,
+      "bUPGet": 0,
+      "bDLGet": 0,
       "tszUPPass": "http://192.168.1.7:5200/Api/Pass/UPFile",
       "tszDLPass": "http://192.168.1.7:5200/Api/Pass/UPFile"
     }
@@ -57,11 +56,12 @@
   },
   "XVer": {
     "StorageVersion": [
+      "1.5.0.1001 Build20210716",
       "1.4.0.1001 Build20210702",
       "1.3.0.1001 Build20210625",
       "1.2.0.1001 Build20210618",
       "1.1.0.1001 Build20210611",
       "1.0.0.1001 Build20210501"
     ]
   }
-}
+}

XEngine_Docment/Docment_zh.docx

@@ -0,0 +1,21 @@
+{
+  "tszIPAddr": "127.0.0.1",
+  "bDistributed": 1,
+  "LBConfig": {
+    "nServerMode": 1
+  },
+  "LoadBalance": {
+    "nUseMode": [
+      0
+    ],
+    "CenterAddr": [
+      "http://192.168.1.9:5100"
+    ],
+    "DownloadAddr": [
+      "http://192.168.1.9:5010"
+    ],
+    "UPLoaderAddr": [
+      "http://192.168.1.9:5102"
+    ]
+  }
+}

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -3,39 +3,50 @@ UNICODE = 0
 
 FLAGS = RELEASE=$(RELEASE)
 
-COMPONENTS_SQL_PATH = ./XEngine_StorageComponents/XStorage_SQLPacket
-COMPONENTS_PROTOCOL_PATH = ./XEngine_StorageComponents/XStorage_Protocol
+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
 
 BASE_CONFIG_PATH = ./StorageModule_Config
 BASE_SESSION_PATH = ./StorageModule_Session
+BASE_APIHELP_PATH = ./StorageModule_APIHelp
 
 APPSERVICE_STORAGE_PATH = ./XEngine_StorageApp
 
 NETENGINE_LIB = libXStorage_SQLPacket.so libXStorage_Protocol.so                       \
-                libStorageModule_Config.so libStorageModule_Session.so                 \
+                libXEngine_P2XPPeer.so libXEngine_P2XPProtocol.so                      \
+                libStorageModule_Config.so libStorageModule_Session.so libStorageModule_APIHelp.so                 \
 		 XEngine_StorageApp.exe 
 
 .PHONY:MakeAll 
 MakeAll:$(NETENGINE_LIB)
 
 libXStorage_SQLPacket.so:
-	make -C $(COMPONENTS_SQL_PATH) $(FLAGS)
+	make -C $(STORAGE_SQL_PATH) $(FLAGS)
 libXStorage_Protocol.so:
-	make -C $(COMPONENTS_PROTOCOL_PATH) $(FLAGS)
+	make -C $(STORAGE_PROTOCOL_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)
 
 XEngine_StorageApp.exe:
 	make -C $(APPSERVICE_STORAGE_PATH) $(FLAGS)
 
-#安装开发包文件 
+
 SetFlags_Install:
 	export FLAGS=InstallAll
 InstallAll:SetFlags_Install $(NETENGINE_LIB) 
-#清除临时文件   
+ 
 SetFlags_Clean:
 	export FLAGS=CleanAll
 CleanAll:SetFlags_Clean $(NETENGINE_LIB) 

XEngine_Release/XEngine_Config/XEngine_LBConfig.json

@@ -0,0 +1,21 @@
+#pragma once
+/********************************************************************
+//    Created:     2021/07/08  15:37:18
+//    File Name:   D:\XEngine_Storage\XEngine_Source\StorageModule_APIHelp\APIHelp_Define.h
+//    File Path:   D:\XEngine_Storage\XEngine_Source\StorageModule_APIHelp
+//    File Base:   APIHelp_Define
+//    File Ext:    h
+//    Project:     XEngine(网络通信引擎)
+//    Author:      qyt
+//    Purpose:     导出定义
+//    History:
+*********************************************************************/
+//////////////////////////////////////////////////////////////////////////
+//                       导出函数
+//////////////////////////////////////////////////////////////////////////
+extern "C" DWORD StorageHelp_GetLastError(int* pInt_SysError = NULL);
+/************************************************************************/
+/*                                                                      */
+/************************************************************************/
+extern "C" BOOL APIHelp_Distributed_IsMode(list<int>*pStl_ListMode, int nMode);
+extern "C" BOOL APIHelp_Distributed_RandomAddr(list<tstring>* pStl_ListAddr, TCHAR* ptszAddr);

XEngine_Release/XEngine_SQL/.gitignore

@@ -0,0 +1,57 @@
+#include "pch.h"
+#include "APIHelp_Distributed.h"
+/********************************************************************
+//    Created:     2021/07/08  15:26:13
+//    File Name:   D:\XEngine_Storage\XEngine_Source\StorageModule_APIHelp\APIHelp_Distributed\APIHelp_Distributed.cpp
+//    File Path:   D:\XEngine_Storage\XEngine_Source\StorageModule_APIHelp\APIHelp_Distributed
+//    File Base:   APIHelp_Distributed
+//    File Ext:    cpp
+//    Project:     XEngine(网络通信引擎)
+//    Author:      qyt
+//    Purpose:     分布式帮助函数
+//    History:
+*********************************************************************/
+CAPIHelp_Distributed::CAPIHelp_Distributed()
+{
+
+}
+CAPIHelp_Distributed::~CAPIHelp_Distributed()
+{
+
+}
+BOOL CAPIHelp_Distributed::APIHelp_Distributed_IsMode(list<int>* pStl_ListMode, int nMode)
+{
+	BOOL bFound = FALSE;
+	list<int>::const_iterator stl_ListIterator = pStl_ListMode->begin();
+	for (; stl_ListIterator != pStl_ListMode->end(); stl_ListIterator++)
+	{
+		if (nMode == *stl_ListIterator)
+		{
+			bFound = TRUE;
+			break;
+		}
+	}
+	return bFound;
+}
+BOOL CAPIHelp_Distributed::APIHelp_Distributed_RandomAddr(list<tstring>* pStl_ListAddr, TCHAR* ptszAddr)
+{
+	BOOL bFound = FALSE;
+	XNETHANDLE xhToken = 0;
+
+	BaseLib_OperatorHandle_Create(&xhToken, 0, pStl_ListAddr->size(), FALSE);
+	if (xhToken == pStl_ListAddr->size())
+	{
+		xhToken--;
+	}
+	list<tstring>::const_iterator stl_ListIterator = pStl_ListAddr->begin();
+	for (XNETHANDLE i = 0; stl_ListIterator != pStl_ListAddr->end(); stl_ListIterator++, i++)
+	{
+		if (xhToken == i)
+		{
+			bFound = TRUE;
+			_tcscpy(ptszAddr, stl_ListIterator->c_str());
+			break;
+		}
+	}
+	return bFound;
+}