Merge pull request #49 from libxengine/develop

V3.16.0.1001 Merge

Author: xengine-qyt

README.en.md

@@ -33,6 +33,8 @@ feature list:
 16. permission control
 17. upload file rewrite
 18. support convert record(service upload and download)
+19. webdav protocol download and upload file support
+20. preview file create
 
 ## install
 
@@ -128,6 +130,9 @@ Port:HTTP Center Port 5100,Download 5101,UPLoad 5102
 3. Submit the code
 4. New Pull Request
 
+## development plan
+You can learn more about development content and plans at this address:https://github.com/libxengine/XEngine_Storage/issues
+
 ## Follow us
 If you think this software is helpful to you, please give us a START  
 and wechat qr scan to follow us 

README.md

@@ -32,6 +32,8 @@ c c++ file storage service
 16. 权限控制
 17. 上传文件覆写
 18. 支持转录(服务器上传下载)
+19. 支持WEBDAV协议上传下载文件
+20. 预创建文件
 
 ## 安装教程
 
@@ -50,6 +52,7 @@ macos执行:./XEngine_LINEnv.sh -i 3
 由于依赖的子模块,在你checkout仓库后,在仓库目录下执行下面的命令拉取子模块  
 git submodule init  
 git submodule update  
+如果github访问失败,也可以在XEngine_Source\XEngine_Depend 下直接clone项目:git clone https://gitee.com/xengine/XEngine_OPenSource.git
 
 #### Windows
 使用VS打开并且编译,支持WINDOWS 7SP1以上系统  
@@ -131,6 +134,9 @@ jsoncpp模块在使用的时候编译运行时库选择必须一致.否则会崩
 3.  提交代码
 4.  新建 Pull Request  
 
+## 开发计划
+你可以通过此地址了解更多开发内容和计划:https://github.com/libxengine/XEngine_Storage/issues
+
 ## 关注我们
 
 如果你觉得这个软件对你有帮助,请你给我们一个START吧  

XEngine_Docment/Docment_en.docx

@@ -4,20 +4,23 @@
     "nCenterPort":5100,
     "nStorageDLPort":5101,
     "nStorageUPPort":5102,
+    "nWebdavPort":5103,
     "XMax":{
         "MaxClient":10000,
         "MaxQueue":10000,
         "IOThread":2,
         "CenterThread":2,
         "nStorageUPThread":2,
-        "nStorageDLThread":2
+        "nStorageDLThread":2,
+        "nWebdavThread":2
     },
     "XTime":{
         "bHBTime":0,
         "nDBMonth":3,
         "nTimeCheck":3,
         "nCenterTimeOut":5,
-        "nStorageTimeOut":5
+        "nStorageTimeOut":5,
+        "nWebdavTimeOut":5
     },
     "XLog":{
         "MaxSize":1024000,
@@ -67,6 +70,7 @@
         "bDLEnable":false,
         "bUPEnable":false,
         "bCHEnable":false,
+        "bWDEnable":false,
         "tszCertChain":"./XEngine_Cert/server.crt",
         "tszCertServer":"",
         "tszCertKey":"./XEngine_Cert/server.key"

XEngine_Docment/Docment_zh.docx

@@ -25,8 +25,9 @@
                 "XEngine_Path":"./XEngine_File",
                 "PermissionFlags":{
                     "CreateDir":false,
-                    "Rewrite":false,
-                    "UPLimit":false
+                    "Rewrite":true,
+                    "UPLimit":false,
+                    "UPReady":true
                 }
             },
             {
@@ -37,8 +38,9 @@
                 "XEngine_Path":"./XEngine_File2",
                 "PermissionFlags":{
                     "CreateDir":false,
-                    "Rewrite":false,
-                    "UPLimit":false
+                    "Rewrite":true,
+                    "UPLimit":false,
+                    "UPReady":true
                 }
             }
         ]

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -1,5 +1,6 @@
 {
     "XVer":[
+        "3.16.0.1001 Build20240813",
         "3.15.0.1001 Build20240511",
         "3.14.0.1001 Build20240418",
         "3.13.0.1001 Build20240301",

XEngine_Release/XEngine_Config/XEngine_LBConfig.json

@@ -4,6 +4,7 @@ PLATFORM=linux
 FLAGS= 
 
 THIRD_JSONCPP_PATH = ./XEngine_Depend/XEngine_Module/jsoncpp
+THIRD_TINYXML_PATH = ./XEngine_Depend/XEngine_Module/tinyxml2
 THIRD_REPORT_PATH = ./XEngine_Depend/XEngine_Module/XEngine_InfoReport
 
 BASE_SQL_PATH = ./StorageModule_Database
@@ -15,17 +16,31 @@ BASE_BTORRENT_PATH = ./StorageModule_BTorrent
 
 APPSERVICE_STORAGE_PATH = ./XEngine_StorageApp
 
-XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so                                   \
+XENGINE_MODULES = libjsoncpp.so libtinyxml2.so libXEngine_InfoReport.so                                   \
                 libStorageModule_Database.so libStorageModule_Config.so libStorageModule_Session.so libStorageModule_APIHelp.so libStorageModule_Protocol.so libStorageModule_BTorrent.so    \
 		 		XEngine_StorageApp.exe 
 
 .PHONY:MakeAll 
 MakeAll:$(XENGINE_MODULES)
 
 libjsoncpp.so:
+ifeq ($(FLAGS), InstallAll)
+	cp $(THIRD_JSONCPP_PATH)/libjsoncpp.so ../XEngine_Release/
+else
 	make -C $(THIRD_JSONCPP_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
+endif
+libtinyxml2.so:
+ifeq ($(FLAGS), InstallAll)
+	cp $(THIRD_TINYXML_PATH)/libtinyxml2.so ../XEngine_Release/
+else
+	make -C $(THIRD_TINYXML_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
+endif
 libXEngine_InfoReport.so:
+ifeq ($(FLAGS), InstallAll)
+	cp $(THIRD_REPORT_PATH)/libXEngine_InfoReport.so ../XEngine_Release/
+else
 	make -C $(THIRD_REPORT_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
+endif
 
 libStorageModule_Database.so:
 	make -C $(BASE_SQL_PATH) PLATFORM=$(PLATFORM) $(FLAGS)

XEngine_Release/XEngine_Config/XEngine_VersionConfig.json

@@ -427,6 +427,8 @@ bool CAPIHelp_Api::APIHelp_Api_Boundary(XCHAR*** ppptszList, int nListCount, XCH
 *********************************************************************/
 bool CAPIHelp_Api::APIHelp_Api_GetDIRSize(LPCXSTR lpszDIRStr, __int64u* pInt_DIRSize)
 {
+	APIHelp_IsErrorOccur = false;
+
 	int nListCount = 0;
 	int nPathType = 0;
 	__int64u nDirCount = 0;   //当前目录大小
@@ -453,5 +455,50 @@ bool CAPIHelp_Api::APIHelp_Api_GetDIRSize(LPCXSTR lpszDIRStr, __int64u* pInt_DIR
 	}
 	BaseLib_OperatorMemory_Free((XPPPMEM)&ppListFile, nListCount);
 	*pInt_DIRSize = nDirCount;
+	return true;
+}
+/********************************************************************
+函数名称：APIHelp_Api_UrlStr
+函数功能：获取URL的KEY
+ 参数.一：ptszKeyStr
+  In/Out：Out
+  类型：字符指针
+  可空：N
+  意思：输出获取到的数据
+ 参数.二：lpszUrl
+  In/Out：In
+  类型：常量字符指针
+  可空：N
+  意思：输入要获取的数据
+返回值
+  类型：逻辑型
+  意思：是否成功
+备注：
+*********************************************************************/
+bool CAPIHelp_Api::APIHelp_Api_UrlStr(XCHAR* ptszKeyStr, LPCXSTR lpszUrl)
+{
+	APIHelp_IsErrorOccur = false;
+
+	XCHAR tszUrlStr[MAX_PATH] = {};
+	_tcsxcpy(tszUrlStr, lpszUrl);
+	// 查找第一个 '/' 的位置
+	XCHAR *ptszFirstStr = _tcsxchr(tszUrlStr, '/');
+	if (ptszFirstStr == NULL) 
+	{
+		return false;
+	}
+	// 查找第二个 '/' 的位置
+	XCHAR* ptszSecondStr = _tcsxchr(ptszFirstStr + 1, '/');
+	if (ptszSecondStr == NULL)
+	{
+		return false;
+	}
+	// 计算提取字符串的长度
+	int nLen = ptszSecondStr - ptszFirstStr - 1;
+	// 复制字符串
+	_tcsxncpy(ptszKeyStr, ptszFirstStr + 1, nLen);
+	// 添加字符串结束符
+	ptszKeyStr[nLen] = '\0';
+
 	return true;
 }

XEngine_Source/Makefile

@@ -25,6 +25,7 @@ class CAPIHelp_Api
 	bool APIHelp_Api_UrlParse(XCHAR*** ppptszList, int nListCount, XCHAR* ptszFileName, XCHAR* ptszKeyName);
 	bool APIHelp_Api_Boundary(XCHAR*** ppptszList, int nListCount, XCHAR* ptszBoundStr);
 	bool APIHelp_Api_GetDIRSize(LPCXSTR lpszDIRStr, __int64u* pInt_DIRSize);
+	bool APIHelp_Api_UrlStr(XCHAR* ptszKeyStr, LPCXSTR lpszUrl);
 protected:
 private:
 };