supported nginx file rename of upload

supported nginx upfile insert to database

Author: xengine-qyt

XEngine_Docment/Docment_en.docx

@@ -33,6 +33,7 @@
   "XStorage": {
     "nUseMode": 1,
     "nHashMode": 2,
+    "bRename": 0,
     "tszHttpAddr": "http://192.168.1.4",
     "tszNginAddr": "http://192.168.1.4:5010",
     "tszFileDir": "./XEngine_File"

XEngine_Docment/Docment_zh.docx

@@ -11,7 +11,7 @@
  Target Server Version : 80025
  File Encoding         : 65001
 
- Date: 10/06/2021 14:42:39
+ Date: 17/06/2021 17:19:26
 */
 
 SET NAMES utf8mb4;

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -11,7 +11,7 @@
  Target Server Version : 80025
  File Encoding         : 65001
 
- Date: 10/06/2021 14:42:32
+ Date: 17/06/2021 17:19:07
 */
 
 SET NAMES utf8mb4;
@@ -30,6 +30,6 @@ CREATE TABLE `XStorage_File`  (
   `FileSize` bigint NOT NULL COMMENT '文件大小',
   `FileTime` datetime NOT NULL COMMENT '插入时间',
   PRIMARY KEY (`ID`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
 
 SET FOREIGN_KEY_CHECKS = 1;

XEngine_SQLFile/XEngine.sql

@@ -53,6 +53,7 @@ typedef struct tag_XEngine_ServerConfig
     }st_XSql;
     struct  
 	{
+        BOOL bRename;
         int nUseMode;
         int nHashMode;
         TCHAR tszHttpAddr[MAX_PATH];

XEngine_SQLFile/XEngine_Storage.sql

@@ -119,7 +119,7 @@ BOOL CConfig_Json::Config_Json_File(LPCTSTR lpszConfigFile,XENGINE_SERVERCONFIG
     _tcscpy(pSt_ServerConfig->st_XSql.tszSQLUser,st_JsonXSql["SQLUser"].asCString());
     _tcscpy(pSt_ServerConfig->st_XSql.tszSQLPass,st_JsonXSql["SQLPass"].asCString());
 
-    if (st_JsonRoot["XStorage"].empty() || (5 != st_JsonRoot["XStorage"].size()))
+    if (st_JsonRoot["XStorage"].empty() || (6 != st_JsonRoot["XStorage"].size()))
     {
         Config_IsErrorOccur = TRUE;
         Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_XSTORAGE;
@@ -128,6 +128,7 @@ BOOL CConfig_Json::Config_Json_File(LPCTSTR lpszConfigFile,XENGINE_SERVERCONFIG
     Json::Value st_JsonXStorage = st_JsonRoot["XStorage"];
 	pSt_ServerConfig->st_XStorage.nUseMode = st_JsonXStorage["nUseMode"].asInt();
     pSt_ServerConfig->st_XStorage.nHashMode = st_JsonXStorage["nHashMode"].asInt();
+    pSt_ServerConfig->st_XStorage.bRename = st_JsonXStorage["bRename"].asInt();
 	_tcscpy(pSt_ServerConfig->st_XStorage.tszHttpAddr, st_JsonXStorage["tszHttpAddr"].asCString());
 	_tcscpy(pSt_ServerConfig->st_XStorage.tszNginAddr, st_JsonXStorage["tszNginAddr"].asCString());
     _tcscpy(pSt_ServerConfig->st_XStorage.tszFileDir, st_JsonXStorage["tszFileDir"].asCString());

XEngine_Source/StorageModule_Config/Config_Define.h

@@ -147,15 +147,15 @@ BOOL XEngine_Task_HttpCenter(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int
 			LPCTSTR lpszBoundaryStr = _T("boundary=");
 			TCHAR tszContentStr[MAX_PATH];
 			TCHAR tszBoundarTmp[MAX_PATH];
-			TCHAR tszBoundarStr[MAX_PATH];
 			TCHAR tszFileDir[MAX_PATH];
+			TCHAR tszBoundarStr[512];
 			XSTORAGECORE_DBFILE st_DBFile;
 
 			memset(tszContentStr, '\0', MAX_PATH);
 			memset(tszBoundarTmp, '\0', MAX_PATH);
-			memset(tszBoundarStr, '\0', MAX_PATH);
 			memset(tszContentStr, '\0', MAX_PATH);
 			memset(tszFileDir, '\0', MAX_PATH);
+			memset(tszBoundarStr, '\0', sizeof(tszBoundarStr));
 			memset(&st_DBFile, '\0', sizeof(XSTORAGECORE_DBFILE));
 
 			if (!RfcComponents_HttpHelp_GetField(&pptszListHdr, nHdrCount, lpszContentType, tszContentStr))
@@ -179,10 +179,19 @@ BOOL XEngine_Task_HttpCenter(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int
 				return FALSE;
 			}
 			_stprintf(tszBoundarStr, _T("--%s\r\n"), tszBoundarTmp);
-			
 			XStorageProtocol_Core_REQUPEvent(lpszMsgBuffer, tszBoundarStr, st_DBFile.st_ProtocolFile.tszFileName, tszFileDir, st_DBFile.st_ProtocolFile.tszFileHash, &st_DBFile.st_ProtocolFile.nFileSize);
-			_tcscpy(st_DBFile.st_ProtocolFile.tszFilePath, st_ServiceCfg.st_XStorage.tszFileDir);
-
+			
+			if (st_ServiceCfg.st_XStorage.bRename)
+			{
+				memset(st_DBFile.st_ProtocolFile.tszFilePath, '\0', MAX_PATH);
+				_tcscpy(st_DBFile.st_ProtocolFile.tszFilePath, st_ServiceCfg.st_XStorage.tszFileDir);
+			}
+			else
+			{
+				memset(st_DBFile.st_ProtocolFile.tszFileName, '\0', MAX_PATH);
+				BaseLib_OperatorString_GetFileAndPath(tszFileDir, st_DBFile.st_ProtocolFile.tszFilePath, st_DBFile.st_ProtocolFile.tszFileName);
+				st_DBFile.st_ProtocolFile.tszFilePath[_tcslen(st_DBFile.st_ProtocolFile.tszFilePath) - 1] = '\0';
+			}
 			if (XStorageSQL_File_FileInsert(&st_DBFile))
 			{
 				st_HDRParam.nHttpCode = 200;
@@ -197,6 +206,14 @@ BOOL XEngine_Task_HttpCenter(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int
 				XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
 				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("业务客户端:%s,处理NGINX代理上传文件失败,插入数据库失败:%s,错误:%lX"), lpszClientAddr, tszFileDir, XStorageDB_GetLastError());
 			}
+			if (st_ServiceCfg.st_XStorage.bRename)
+			{
+				TCHAR tszFileTmp[1024];
+				memset(tszFileTmp, '\0', sizeof(tszFileTmp));
+
+				_stprintf(tszFileTmp, _T("%s/%s"), st_DBFile.st_ProtocolFile.tszFilePath, st_DBFile.st_ProtocolFile.tszFileName);
+				_trename(tszFileDir, tszFileTmp);
+			}
 		}
 	}
 	return TRUE;