Skip to content

Commit 04ccdea

Browse files
xengine-qytxengine-qyt
committed
Support not using sql service now
1 parent c2c8336 commit 04ccdea

File tree

5 files changed

+89
-44
lines changed

5 files changed

+89
-44
lines changed

‎XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp‎

Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,28 @@ BOOL XEngine_Task_HttpCenter(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int
157157
int nListCount = 0;
158158
XSTORAGECORE_DBFILE** ppSt_ListFile;
159159
XStorageProtocol_Core_REQQueryFile(lpszMsgBuffer, tszTimeStart, tszTimeEnd, tszFileHash);
160-
XStorageSQL_File_FileQuery(&ppSt_ListFile, &nListCount, tszTimeStart, tszTimeEnd, tszFileName, tszFileHash);
161160

162-
st_HDRParam.bIsClose = TRUE;
163-
st_HDRParam.nHttpCode = 200;
164-
165-
XStorageProtocol_Core_REPQueryFile(tszMsgBuffer, &nMsgLen, &ppSt_ListFile, nListCount, tszTimeStart, tszTimeEnd);
166-
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszMsgBuffer, nMsgLen);
167-
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
168-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端:%s,请求查询文件列表成功,列表个数:%d"), lpszClientAddr, nListCount);
169-
BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListFile, nListCount);
161+
if (bIsSQL)
162+
{
163+
XStorageSQL_File_FileQuery(&ppSt_ListFile, &nListCount, tszTimeStart, tszTimeEnd, tszFileName, tszFileHash);
164+
st_HDRParam.bIsClose = TRUE;
165+
st_HDRParam.nHttpCode = 200;
166+
167+
XStorageProtocol_Core_REPQueryFile(tszMsgBuffer, &nMsgLen, &ppSt_ListFile, nListCount, tszTimeStart, tszTimeEnd);
168+
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszMsgBuffer, nMsgLen);
169+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
170+
BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListFile, nListCount);
171+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端:%s,请求查询文件列表成功,列表个数:%d"), lpszClientAddr, nListCount);
172+
}
173+
else
174+
{
175+
st_HDRParam.bIsClose = TRUE;
176+
st_HDRParam.nHttpCode = 406;
177+
178+
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
179+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
180+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("业务客户端:%s,请求查询文件列表失败,服务器没有启用这个功能"), lpszClientAddr);
181+
}
170182
}
171183
}
172184
else if (0 == _tcsnicmp(lpszEvent, tszAPIMethod, _tcslen(lpszEvent)))
@@ -223,20 +235,29 @@ BOOL XEngine_Task_HttpCenter(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int
223235
BaseLib_OperatorString_GetFileAndPath(tszFileDir, st_DBFile.st_ProtocolFile.tszFilePath, st_DBFile.st_ProtocolFile.tszFileName);
224236
st_DBFile.st_ProtocolFile.tszFilePath[_tcslen(st_DBFile.st_ProtocolFile.tszFilePath) - 1] = '\0';
225237
}
226-
if (XStorageSQL_File_FileInsert(&st_DBFile))
238+
239+
if (bIsSQL)
227240
{
228-
st_HDRParam.nHttpCode = 200;
229-
RfcComponents_HttpServer_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
230-
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
231-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端:%s,处理NGINX代理上传文件成功,文件名:%s,大小:%lld"), lpszClientAddr, tszFileDir, st_DBFile.st_ProtocolFile.nFileSize);
241+
if (XStorageSQL_File_FileInsert(&st_DBFile))
242+
{
243+
st_HDRParam.nHttpCode = 200;
244+
RfcComponents_HttpServer_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
245+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
246+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端:%s,处理NGINX代理上传文件成功,文件名:%s,大小:%lld"), lpszClientAddr, tszFileDir, st_DBFile.st_ProtocolFile.nFileSize);
247+
}
248+
else
249+
{
250+
st_HDRParam.nHttpCode = 403;
251+
RfcComponents_HttpServer_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
252+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
253+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("业务客户端:%s,处理NGINX代理上传文件失败,插入数据库失败:%s,错误:%lX"), lpszClientAddr, tszFileDir, XStorageDB_GetLastError());
254+
}
232255
}
233256
else
234257
{
235-
st_HDRParam.nHttpCode = 403;
236-
RfcComponents_HttpServer_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
237-
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
238-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("业务客户端:%s,处理NGINX代理上传文件失败,插入数据库失败:%s,错误:%lX"), lpszClientAddr, tszFileDir, XStorageDB_GetLastError());
258+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("业务客户端:%s,处理NGINX代理上传文件成功,文件名:%s,大小:%lld,服务器没有启用数据库,不插入"), lpszClientAddr, tszFileDir, st_DBFile.st_ProtocolFile.nFileSize);
239259
}
260+
240261
if (st_ServiceCfg.st_XStorage.bRename)
241262
{
242263
TCHAR tszFileTmp[1024];

‎XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ using namespace std;
5252
#define STORAGE_NETTYPE_HTTPCENTER 3
5353

5454
extern BOOL bIsRun;
55+
extern BOOL bIsSQL;
5556
extern XLOG xhLog;
5657

5758
extern XNETHANDLE xhHBDownload;

‎XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp‎

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -130,34 +130,42 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
130130

131131
OPenSsl_Api_Digest(tszFileDir, tszHashStr, NULL, TRUE, st_ServiceCfg.st_XStorage.nHashMode);
132132
BaseLib_OperatorString_StrToHex((char*)tszHashStr, 20, st_ProtocolFile.st_ProtocolFile.tszFileHash);
133-
if (XStorageSQL_File_FileInsert(&st_ProtocolFile))
133+
134+
if (bIsSQL)
134135
{
135-
if (st_ServiceCfg.st_XProxy.st_XProxyPass.bUPPass)
136+
if (XStorageSQL_File_FileInsert(&st_ProtocolFile))
136137
{
137-
int nPLen = MAX_PATH;
138-
int nHttpCode = 0;
139-
TCHAR tszProxyStr[MAX_PATH];
140-
SESSION_STORAGEINFO st_StorageInfo;
141-
142-
memset(tszProxyStr, '\0', MAX_PATH);
143-
memset(&st_StorageInfo, '\0', sizeof(SESSION_STORAGEINFO));
144-
145-
Session_UPStroage_GetInfo(lpszClientAddr, &st_StorageInfo);
146-
XStorageProtocol_Proxy_PacketUPDown(st_StorageInfo.tszFileDir, st_StorageInfo.tszClientAddr, st_StorageInfo.ullRWCount, tszProxyStr, &nPLen);
147-
APIHelp_HttpRequest_Post(st_ServiceCfg.st_XProxy.st_XProxyPass.tszUPPass, tszProxyStr, &nHttpCode);
148-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_NOTICE, _T("上传客户端:%s,请求完成通知返回值:%d,文件:%s,地址:%s"), lpszClientAddr, nHttpCode, st_StorageInfo.tszFileDir, st_ServiceCfg.st_XProxy.st_XProxyPass.tszUPPass);
138+
if (st_ServiceCfg.st_XProxy.st_XProxyPass.bUPPass)
139+
{
140+
int nPLen = MAX_PATH;
141+
int nHttpCode = 0;
142+
TCHAR tszProxyStr[MAX_PATH];
143+
SESSION_STORAGEINFO st_StorageInfo;
144+
145+
memset(tszProxyStr, '\0', MAX_PATH);
146+
memset(&st_StorageInfo, '\0', sizeof(SESSION_STORAGEINFO));
147+
148+
Session_UPStroage_GetInfo(lpszClientAddr, &st_StorageInfo);
149+
XStorageProtocol_Proxy_PacketUPDown(st_StorageInfo.tszFileDir, st_StorageInfo.tszClientAddr, st_StorageInfo.ullRWCount, tszProxyStr, &nPLen);
150+
APIHelp_HttpRequest_Post(st_ServiceCfg.st_XProxy.st_XProxyPass.tszUPPass, tszProxyStr, &nHttpCode);
151+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_NOTICE, _T("上传客户端:%s,请求完成通知返回值:%d,文件:%s,地址:%s"), lpszClientAddr, nHttpCode, st_StorageInfo.tszFileDir, st_ServiceCfg.st_XProxy.st_XProxyPass.tszUPPass);
152+
}
153+
st_HDRParam.nHttpCode = 200;
154+
RfcComponents_HttpServer_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
155+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
156+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("上传客户端:%s,请求上传文件成功,文件名:%s,大小:%d"), lpszClientAddr, tszFileDir, nRVCount);
157+
}
158+
else
159+
{
160+
st_HDRParam.nHttpCode = 403;
161+
RfcComponents_HttpServer_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
162+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
163+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("上传客户端:%s,请求上传文件失败,插入数据库失败:%s,错误:%lX"), lpszClientAddr, tszFileDir, XStorageDB_GetLastError());
149164
}
150-
st_HDRParam.nHttpCode = 200;
151-
RfcComponents_HttpServer_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
152-
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
153-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("上传客户端:%s,请求上传文件成功,文件名:%s,大小:%d"), lpszClientAddr, tszFileDir, nRVCount);
154165
}
155166
else
156167
{
157-
st_HDRParam.nHttpCode = 403;
158-
RfcComponents_HttpServer_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
159-
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
160-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("上传客户端:%s,请求上传文件失败,插入数据库失败:%s,错误:%lX"), lpszClientAddr, tszFileDir, XStorageDB_GetLastError());
168+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("上传客户端:%s,请求上传文件成功,文件名:%s,大小:%d,数据库没有启用,不插入数据库"), lpszClientAddr, tszFileDir, nRVCount);
161169
}
162170
Session_UPStroage_Delete(lpszClientAddr);
163171
}

‎XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.cpp‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "StorageApp_Hdr.h"
22

33
BOOL bIsRun = FALSE;
4+
BOOL bIsSQL = FALSE;
45
XLOG xhLog = NULL;
56

67
XNETHANDLE xhHBDownload = 0;
@@ -142,12 +143,25 @@ int main(int argc, char** argv)
142143
{
143144
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("启动服务中，心跳管理服务配置为不启用..."));
144145
}
145-
if (!XStorageSQL_Init((DATABASE_MYSQL_CONNECTINFO*)&st_ServiceCfg.st_XSql, st_ServiceCfg.st_XTime.nDBMonth))
146+
147+
if (st_ServiceCfg.st_XSql.nSQLPort > 0)
146148
{
147-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，初始化数据库服务失败，错误：%lX"), XStorageDB_GetLastError());
148-
goto XENGINE_EXITAPP;
149+
if (XStorageSQL_Init((DATABASE_MYSQL_CONNECTINFO*)&st_ServiceCfg.st_XSql, st_ServiceCfg.st_XTime.nDBMonth))
150+
{
151+
bIsSQL = TRUE;
152+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，初始化数据库服务成功"));
153+
}
154+
else
155+
{
156+
bIsSQL = FALSE;
157+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，初始化数据库服务失败，错误：%lX"), XStorageDB_GetLastError());
158+
}
159+
}
160+
else
161+
{
162+
bIsSQL = FALSE;
163+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("启动服务中，数据库被设置为不启用"));
149164
}
150-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，初始化数据库服务成功"));
151165

152166
xhDLHttp = RfcComponents_HttpServer_InitEx(lpszHTTPCode, lpszHTTPMime, st_ServiceCfg.st_XMax.nStorageDLThread);
153167
if (NULL == xhDLHttp)

‎XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorageSQL_Info/XStorageSQL_Info.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ BOOL CXStorageSQL_Info::XStorageSQL_Info_Destory()
9797
BOOL CXStorageSQL_Info::XStorageSQL_Info_UserInsert(XSTORAGECORE_USERINFO *pSt_DBUser)
9898
{
9999
XStorage_IsErrorOccur = FALSE;
100+
100101
//是否存在,存在直接返回真
101102
if (XStorageSQL_Info_UserQuery(pSt_DBUser))
102103
{

0 commit comments

Comments
 (0)