Skip to content

X
XEngine APIService

XEngine / XEngine APIService
9 个月 前同步成功

通知 0
Star 1
Fork 0
X
XEngine APIService

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 ee641df1 编写于 作者: xengine-qyt's avatar xengine-qyt
浏览文件
操作

update:xengine v8.10 

modify:charset to unicode
上级 e14e5844
展开全部 隐藏空白更改
内联 并排
Showing with 1535 addition and 1573 deletion
XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp
浏览文件 @ ee641df1
......@@ -42,24 +42,24 @@ CModuleConfigure_Json::~CModuleConfigure_Json()
*********************************************************************/
XBOOL CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XENGINE_SERVICECONFIG* pSt_ServerConfig)
{
Config_IsErrorOccur = XFALSE;
Config_IsErrorOccur = FALSE;
if ((NULL == lpszConfigFile) || (NULL == pSt_ServerConfig))
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_PARAMENT;
return XFALSE;
return FALSE;
}
Json::Value st_JsonRoot;
JSONCPP_STRING st_JsonError;
Json::CharReaderBuilder st_JsonBuilder;
//读取配置文件所有内容到缓冲区
FILE* pSt_File = _tfopen(lpszConfigFile, _T("rb"));
FILE* pSt_File = _xtfopen(lpszConfigFile, _X("rb"));
if (NULL == pSt_File)
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_OPENFILE;
return XFALSE;
return FALSE;
}
size_t nCount = 0;
XCHAR tszMsgBuffer[4096];
......@@ -77,19 +77,19 @@ XBOOL CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, X
std::unique_ptr<Json::CharReader> const pSt_JsonReader(st_JsonBuilder.newCharReader());
if (!pSt_JsonReader->parse(tszMsgBuffer, tszMsgBuffer + nCount, &st_JsonRoot, &st_JsonError))
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_PARSE;
return XFALSE;
return FALSE;
}
_tcscpy(pSt_ServerConfig->tszIPAddr, st_JsonRoot["tszIPAddr"].asCString());
_tcsxcpy(pSt_ServerConfig->tszIPAddr, st_JsonRoot["tszIPAddr"].asCString());
pSt_ServerConfig->bDeamon = st_JsonRoot["bDeamon"].asInt();
pSt_ServerConfig->nHttpPort = st_JsonRoot["nHttpPort"].asInt();
if (st_JsonRoot["XMax"].empty() || (4 != st_JsonRoot["XMax"].size()))
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_XMAX;
return XFALSE;
return FALSE;
}
Json::Value st_JsonXMax = st_JsonRoot["XMax"];
pSt_ServerConfig->st_XMax.nMaxClient = st_JsonXMax["nMaxClient"].asInt();
......@@ -99,9 +99,9 @@ XBOOL CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, X
if (st_JsonRoot["XTime"].empty() || (3 != st_JsonRoot["XTime"].size()))
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_XTIME;
return XFALSE;
return FALSE;
}
Json::Value st_JsonXTime = st_JsonRoot["XTime"];
pSt_ServerConfig->st_XTime.nTimeCheck = st_JsonXTime["nTimeCheck"].asInt();
......@@ -110,9 +110,9 @@ XBOOL CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, X
if (st_JsonRoot["XLog"].empty() || (3 != st_JsonRoot["XLog"].size()))
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_XLOG;
return XFALSE;
return FALSE;
}
Json::Value st_JsonXLog = st_JsonRoot["XLog"];
pSt_ServerConfig->st_XLog.nMaxSize = st_JsonXLog["MaxSize"].asInt();
......@@ -121,76 +121,76 @@ XBOOL CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, X
if (st_JsonRoot["XApi"].empty() || (2 != st_JsonRoot["XApi"].size()))
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_XAPI;
return XFALSE;
return FALSE;
}
Json::Value st_JsonXApi = st_JsonRoot["XApi"];
_tcscpy(pSt_ServerConfig->st_XApi.tszBankUrl, st_JsonXApi["tszBankUrl"].asCString());
_tcscpy(pSt_ServerConfig->st_XApi.tszTranslationUrl, st_JsonXApi["tszTranslationUrl"].asCString());
_tcsxcpy(pSt_ServerConfig->st_XApi.tszBankUrl, st_JsonXApi["tszBankUrl"].asCString());
_tcsxcpy(pSt_ServerConfig->st_XApi.tszTranslationUrl, st_JsonXApi["tszTranslationUrl"].asCString());
if (st_JsonRoot["XSql"].empty() || (4 != st_JsonRoot["XSql"].size()))
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_XDB;
return XFALSE;
return FALSE;
}
Json::Value st_JsonXSql = st_JsonRoot["XSql"];
pSt_ServerConfig->st_XSql.nSQLPort = st_JsonXSql["SQLPort"].asInt();
_tcscpy(pSt_ServerConfig->st_XSql.tszSQLAddr, st_JsonXSql["SQLAddr"].asCString());
_tcscpy(pSt_ServerConfig->st_XSql.tszSQLUser, st_JsonXSql["SQLUser"].asCString());
_tcscpy(pSt_ServerConfig->st_XSql.tszSQLPass, st_JsonXSql["SQLPass"].asCString());
_tcsxcpy(pSt_ServerConfig->st_XSql.tszSQLAddr, st_JsonXSql["SQLAddr"].asCString());
_tcsxcpy(pSt_ServerConfig->st_XSql.tszSQLUser, st_JsonXSql["SQLUser"].asCString());
_tcsxcpy(pSt_ServerConfig->st_XSql.tszSQLPass, st_JsonXSql["SQLPass"].asCString());
if (st_JsonRoot["XPlugin"].empty() || (3 != st_JsonRoot["XPlugin"].size()))
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_XPLUGIN;
return XFALSE;
return FALSE;
}
Json::Value st_JsonXPlugin = st_JsonRoot["XPlugin"];
pSt_ServerConfig->st_XPlugin.bEnable = st_JsonXPlugin["bEnable"].asBool();
_tcscpy(pSt_ServerConfig->st_XPlugin.tszPluginLib, st_JsonXPlugin["tszPluginLib"].asCString());
_tcscpy(pSt_ServerConfig->st_XPlugin.tszPluginLua, st_JsonXPlugin["tszPluginLua"].asCString());
_tcsxcpy(pSt_ServerConfig->st_XPlugin.tszPluginLib, st_JsonXPlugin["tszPluginLib"].asCString());
_tcsxcpy(pSt_ServerConfig->st_XPlugin.tszPluginLua, st_JsonXPlugin["tszPluginLua"].asCString());
if (st_JsonRoot["XConfig"].empty() || (2 != st_JsonRoot["XConfig"].size()))
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_XCONFIG;
return XFALSE;
return FALSE;
}
Json::Value st_JsonXConfig = st_JsonRoot["XConfig"];
_tcscpy(pSt_ServerConfig->st_XConfig.tszConfigOPencc, st_JsonXConfig["tszConfigOPencc"].asCString());
_tcscpy(pSt_ServerConfig->st_XConfig.tszConfigQRCode, st_JsonXConfig["tszConfigQRCode"].asCString());
_tcsxcpy(pSt_ServerConfig->st_XConfig.tszConfigOPencc, st_JsonXConfig["tszConfigOPencc"].asCString());
_tcsxcpy(pSt_ServerConfig->st_XConfig.tszConfigQRCode, st_JsonXConfig["tszConfigQRCode"].asCString());
if (st_JsonRoot["XShortLink"].empty() || (2 != st_JsonRoot["XShortLink"].size()))
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_XSLINK;
return XFALSE;
return FALSE;
}
Json::Value st_JsonXShort = st_JsonRoot["XShortLink"];
_tcscpy(pSt_ServerConfig->st_XShortLink.tszHostUrl, st_JsonXShort["tszHostUrl"].asCString());
_tcsxcpy(pSt_ServerConfig->st_XShortLink.tszHostUrl, st_JsonXShort["tszHostUrl"].asCString());
pSt_ServerConfig->st_XShortLink.nHTTPCode = st_JsonXShort["nHTTPCode"].asInt();
if (st_JsonRoot["XVer"].empty())
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_XVER;
return XFALSE;
return FALSE;
}
pSt_ServerConfig->st_XVer.pStl_ListVer = new list<string>;
if (NULL == pSt_ServerConfig->st_XVer.pStl_ListVer)
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_MALLOC;
return XFALSE;
return FALSE;
}
Json::Value st_JsonXVer = st_JsonRoot["XVer"];
for (unsigned int i = 0; i < st_JsonXVer.size(); i++)
{
pSt_ServerConfig->st_XVer.pStl_ListVer->push_back(st_JsonXVer[i].asCString());
}
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleConfigure_Json_OPenccFile
......@@ -212,24 +212,24 @@ XBOOL CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, X
*********************************************************************/
XBOOL CModuleConfigure_Json::ModuleConfigure_Json_OPenccFile(LPCXSTR lpszConfigFile, XENGINE_OPENCCCONFIG* pSt_OPenccConfig)
{
Config_IsErrorOccur = XFALSE;
Config_IsErrorOccur = FALSE;
if ((NULL == lpszConfigFile) || (NULL == pSt_OPenccConfig))
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_PARAMENT;
return XFALSE;
return FALSE;
}
Json::Value st_JsonRoot;
JSONCPP_STRING st_JsonError;
Json::CharReaderBuilder st_JsonBuilder;
//读取配置文件所有内容到缓冲区
FILE* pSt_File = _tfopen(lpszConfigFile, _T("rb"));
FILE* pSt_File = _xtfopen(lpszConfigFile, _X("rb"));
if (NULL == pSt_File)
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_OPENFILE;
return XFALSE;
return FALSE;
}
size_t nCount = 0;
XCHAR tszMsgBuffer[4096];
......@@ -247,25 +247,25 @@ XBOOL CModuleConfigure_Json::ModuleConfigure_Json_OPenccFile(LPCXSTR lpszConfigF
std::unique_ptr<Json::CharReader> const pSt_JsonReader(st_JsonBuilder.newCharReader());
if (!pSt_JsonReader->parse(tszMsgBuffer, tszMsgBuffer + nCount, &st_JsonRoot, &st_JsonError))
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_PARSE;
return XFALSE;
return FALSE;
}
_tcscpy(pSt_OPenccConfig->tszFiles2t, st_JsonRoot["tszFiles2t"].asCString());
_tcscpy(pSt_OPenccConfig->tszFilet2s, st_JsonRoot["tszFilet2s"].asCString());
_tcscpy(pSt_OPenccConfig->tszFiles2tw, st_JsonRoot["tszFiles2tw"].asCString());
_tcscpy(pSt_OPenccConfig->tszFiletw2s, st_JsonRoot["tszFiletw2s"].asCString());
_tcscpy(pSt_OPenccConfig->tszFiles2hk, st_JsonRoot["tszFiles2hk"].asCString());
_tcscpy(pSt_OPenccConfig->tszFilehk2s, st_JsonRoot["tszFilehk2s"].asCString());
_tcscpy(pSt_OPenccConfig->tszFiles2twp, st_JsonRoot["tszFiles2twp"].asCString());
_tcscpy(pSt_OPenccConfig->tszFiletw2sp, st_JsonRoot["tszFiletw2sp"].asCString());
_tcscpy(pSt_OPenccConfig->tszFilet2tw, st_JsonRoot["tszFilet2tw"].asCString());
_tcscpy(pSt_OPenccConfig->tszFilehk2t, st_JsonRoot["tszFilehk2t"].asCString());
_tcscpy(pSt_OPenccConfig->tszFilet2hk, st_JsonRoot["tszFilet2hk"].asCString());
_tcscpy(pSt_OPenccConfig->tszFilet2jp, st_JsonRoot["tszFilet2jp"].asCString());
_tcscpy(pSt_OPenccConfig->tszFilejp2t, st_JsonRoot["tszFilejp2t"].asCString());
_tcscpy(pSt_OPenccConfig->tszFiletw2t, st_JsonRoot["tszFiletw2t"].asCString());
return XTRUE;
_tcsxcpy(pSt_OPenccConfig->tszFiles2t, st_JsonRoot["tszFiles2t"].asCString());
_tcsxcpy(pSt_OPenccConfig->tszFilet2s, st_JsonRoot["tszFilet2s"].asCString());
_tcsxcpy(pSt_OPenccConfig->tszFiles2tw, st_JsonRoot["tszFiles2tw"].asCString());
_tcsxcpy(pSt_OPenccConfig->tszFiletw2s, st_JsonRoot["tszFiletw2s"].asCString());
_tcsxcpy(pSt_OPenccConfig->tszFiles2hk, st_JsonRoot["tszFiles2hk"].asCString());
_tcsxcpy(pSt_OPenccConfig->tszFilehk2s, st_JsonRoot["tszFilehk2s"].asCString());
_tcsxcpy(pSt_OPenccConfig->tszFiles2twp, st_JsonRoot["tszFiles2twp"].asCString());
_tcsxcpy(pSt_OPenccConfig->tszFiletw2sp, st_JsonRoot["tszFiletw2sp"].asCString());
_tcsxcpy(pSt_OPenccConfig->tszFilet2tw, st_JsonRoot["tszFilet2tw"].asCString());
_tcsxcpy(pSt_OPenccConfig->tszFilehk2t, st_JsonRoot["tszFilehk2t"].asCString());
_tcsxcpy(pSt_OPenccConfig->tszFilet2hk, st_JsonRoot["tszFilet2hk"].asCString());
_tcsxcpy(pSt_OPenccConfig->tszFilet2jp, st_JsonRoot["tszFilet2jp"].asCString());
_tcsxcpy(pSt_OPenccConfig->tszFilejp2t, st_JsonRoot["tszFilejp2t"].asCString());
_tcsxcpy(pSt_OPenccConfig->tszFiletw2t, st_JsonRoot["tszFiletw2t"].asCString());
return TRUE;
}
/********************************************************************
函数名称：ModuleConfigure_Json_QRCodeFile
......@@ -287,24 +287,24 @@ XBOOL CModuleConfigure_Json::ModuleConfigure_Json_OPenccFile(LPCXSTR lpszConfigF
*********************************************************************/
XBOOL CModuleConfigure_Json::ModuleConfigure_Json_QRCodeFile(LPCXSTR lpszConfigFile, XENGINE_QRCODECONFIG* pSt_QRCodeConfig)
{
Config_IsErrorOccur = XFALSE;
Config_IsErrorOccur = FALSE;
if ((NULL == lpszConfigFile) || (NULL == pSt_QRCodeConfig))
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_PARAMENT;
return XFALSE;
return FALSE;
}
Json::Value st_JsonRoot;
JSONCPP_STRING st_JsonError;
Json::CharReaderBuilder st_JsonBuilder;
//读取配置文件所有内容到缓冲区
FILE* pSt_File = _tfopen(lpszConfigFile, _T("rb"));
FILE* pSt_File = _xtfopen(lpszConfigFile, _X("rb"));
if (NULL == pSt_File)
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_OPENFILE;
return XFALSE;
return FALSE;
}
size_t nCount = 0;
XCHAR tszMsgBuffer[4096];
......@@ -322,15 +322,15 @@ XBOOL CModuleConfigure_Json::ModuleConfigure_Json_QRCodeFile(LPCXSTR lpszConfigF
std::unique_ptr<Json::CharReader> const pSt_JsonReader(st_JsonBuilder.newCharReader());
if (!pSt_JsonReader->parse(tszMsgBuffer, tszMsgBuffer + nCount, &st_JsonRoot, &st_JsonError))
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_PARSE;
return XFALSE;
return FALSE;
}
_tcscpy(pSt_QRCodeConfig->tszModelDetect, st_JsonRoot["tszModelDetect"].asCString());
_tcscpy(pSt_QRCodeConfig->tszModelSr, st_JsonRoot["tszModelSr"].asCString());
_tcscpy(pSt_QRCodeConfig->tszProtoDetect, st_JsonRoot["tszProtoDetect"].asCString());
_tcscpy(pSt_QRCodeConfig->tszProtoSr, st_JsonRoot["tszProtoSr"].asCString());
return XTRUE;
_tcsxcpy(pSt_QRCodeConfig->tszModelDetect, st_JsonRoot["tszModelDetect"].asCString());
_tcsxcpy(pSt_QRCodeConfig->tszModelSr, st_JsonRoot["tszModelSr"].asCString());
_tcsxcpy(pSt_QRCodeConfig->tszProtoDetect, st_JsonRoot["tszProtoDetect"].asCString());
_tcsxcpy(pSt_QRCodeConfig->tszProtoSr, st_JsonRoot["tszProtoSr"].asCString());
return TRUE;
}
/********************************************************************
函数名称：ModuleConfigure_Json_PluginFile
......@@ -352,24 +352,24 @@ XBOOL CModuleConfigure_Json::ModuleConfigure_Json_QRCodeFile(LPCXSTR lpszConfigF
*********************************************************************/
XBOOL CModuleConfigure_Json::ModuleConfigure_Json_PluginFile(LPCXSTR lpszConfigFile, XENGINE_PLUGINCONFIG* pSt_PluginConfig)
{
Config_IsErrorOccur = XFALSE;
Config_IsErrorOccur = FALSE;
if ((NULL == lpszConfigFile) || (NULL == pSt_PluginConfig))
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_PARAMENT;
return XFALSE;
return FALSE;
}
Json::Value st_JsonRoot;
JSONCPP_STRING st_JsonError;
Json::CharReaderBuilder st_JsonBuilder;
//读取配置文件所有内容到缓冲区
FILE* pSt_File = _tfopen(lpszConfigFile, _T("rb"));
FILE* pSt_File = _xtfopen(lpszConfigFile, _X("rb"));
if (NULL == pSt_File)
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_OPENFILE;
return XFALSE;
return FALSE;
}
size_t nCount = 0;
XCHAR tszMsgBuffer[4096];
......@@ -387,17 +387,17 @@ XBOOL CModuleConfigure_Json::ModuleConfigure_Json_PluginFile(LPCXSTR lpszConfigF
std::unique_ptr<Json::CharReader> const pSt_JsonReader(st_JsonBuilder.newCharReader());
if (!pSt_JsonReader->parse(tszMsgBuffer, tszMsgBuffer + nCount, &st_JsonRoot, &st_JsonError))
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_PARSE;
return XFALSE;
return FALSE;
}
//申请内存
pSt_PluginConfig->pStl_ListPlugin = new list<XENGINE_PLUGININFO>;
if (NULL == pSt_PluginConfig->pStl_ListPlugin)
{
Config_IsErrorOccur = XTRUE;
Config_IsErrorOccur = TRUE;
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_MALLOC;
return XFALSE;
return FALSE;
}
//解析列表
Json::Value st_JsonArray = st_JsonRoot["PluginArray"];
......@@ -407,21 +407,21 @@ XBOOL CModuleConfigure_Json::ModuleConfigure_Json_PluginFile(LPCXSTR lpszConfigF
memset(&st_PluginInfo, '\0', sizeof(XENGINE_PLUGININFO));
st_PluginInfo.bEnable = st_JsonArray[i]["PluginEnable"].asBool();
_tcscpy(st_PluginInfo.tszPluginFile, st_JsonArray[i]["PluginFile"].asCString());
_tcsxcpy(st_PluginInfo.tszPluginFile, st_JsonArray[i]["PluginFile"].asCString());
if (NULL == _tcsstr(st_PluginInfo.tszPluginFile + 3,_T(".")))
if (NULL == _tcsxstr(st_PluginInfo.tszPluginFile + 3,_X(".")))
{
#ifdef _MSC_BUILD
_tcscat(st_PluginInfo.tszPluginFile, ".dll");
_tcsxcat(st_PluginInfo.tszPluginFile, ".dll");
#elif __linux__
_tcscat(st_PluginInfo.tszPluginFile, ".so");
_tcsxcat(st_PluginInfo.tszPluginFile, ".so");
#else
_tcscat(st_PluginInfo.tszPluginFile, ".dylib");
_tcsxcat(st_PluginInfo.tszPluginFile, ".dylib");
#endif
}
_tcscpy(st_PluginInfo.tszPluginMethod, st_JsonArray[i]["PluginMethod"].asCString());
_tcsxcpy(st_PluginInfo.tszPluginMethod, st_JsonArray[i]["PluginMethod"].asCString());
pSt_PluginConfig->pStl_ListPlugin->push_back(st_PluginInfo);
}
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj
浏览文件 @ ee641df1
......@@ -30,27 +30,27 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
......
XEngine_Source/XEngine_ModuleConfigure/dllmain.cpp
浏览文件 @ ee641df1
......@@ -14,6 +14,6 @@ XBOOL APIENTRY DllMain( HMODULE hModule,
case DLL_PROCESS_DETACH:
break;
}
return XTRUE;
return TRUE;
}
XEngine_Source/XEngine_ModuleConfigure/pch.cpp
浏览文件 @ ee641df1
......@@ -11,7 +11,7 @@
// Purpose: 导出函数实现
// History:
*********************************************************************/
XBOOL Config_IsErrorOccur = XFALSE;
XBOOL Config_IsErrorOccur = FALSE;
XLONG Config_dwErrorCode = 0;
//////////////////////////////////////////////////////////////////////
CModuleConfigure_Json m_ConfigJson;
......
XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_Bank/ModuleDatabase_Bank.cpp
浏览文件 @ ee641df1
......@@ -36,23 +36,23 @@ CModuleDatabase_Bank::~CModuleDatabase_Bank()
*********************************************************************/
XBOOL CModuleDatabase_Bank::ModuleDatabase_Bank_Init(DATABASE_MYSQL_CONNECTINFO* pSt_DBConnector)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if (NULL == pSt_DBConnector)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
//连接数据库
_tcscpy(pSt_DBConnector->tszDBName, _T("XEngine_APIInfo"));
_tcsxcpy(pSt_DBConnector->tszDBName, _X("XEngine_APIInfo"));
if (!DataBase_MySQL_Connect(&xhDBSQL, pSt_DBConnector))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_Bank_Destory
......@@ -64,10 +64,10 @@ XBOOL CModuleDatabase_Bank::ModuleDatabase_Bank_Init(DATABASE_MYSQL_CONNECTINFO*
*********************************************************************/
XBOOL CModuleDatabase_Bank::ModuleDatabase_Bank_Destory()
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
DataBase_MySQL_Close(xhDBSQL);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_Bank_Query
......@@ -84,13 +84,13 @@ XBOOL CModuleDatabase_Bank::ModuleDatabase_Bank_Destory()
*********************************************************************/
XBOOL CModuleDatabase_Bank::ModuleDatabase_Bank_Query(XENGINE_BANKINFO* pSt_BankInfo)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if (NULL == pSt_BankInfo)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
//查询
__int64u nLine = 0;
......@@ -99,22 +99,22 @@ XBOOL CModuleDatabase_Bank::ModuleDatabase_Bank_Query(XENGINE_BANKINFO* pSt_Bank
XCHAR tszSQLStatement[1024];
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
_stprintf(tszSQLStatement, _T("SELECT * FROM `BankList` WHERE tszBankAbridge = '%s'"), pSt_BankInfo->tszBankAbridge);
_xstprintf(tszSQLStatement, _X("SELECT * FROM `BankList` WHERE tszBankAbridge = '%s'"), pSt_BankInfo->tszBankAbridge);
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
if (nLine <= 0)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_NOTFOUND;
return XFALSE;
return FALSE;
}
XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
_tcscpy(pSt_BankInfo->tszBankName, pptszResult[2]);
_tcsxcpy(pSt_BankInfo->tszBankName, pptszResult[2]);
DataBase_MySQL_FreeResult(xhDBSQL, xhTable);
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_IDCard/ModuleDatabase_IDCard.cpp
浏览文件 @ ee641df1
......@@ -36,23 +36,23 @@ CModuleDatabase_IDCard::~CModuleDatabase_IDCard()
*********************************************************************/
XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_Init(DATABASE_MYSQL_CONNECTINFO* pSt_DBConnector)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if (NULL == pSt_DBConnector)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
//连接数据库
_tcscpy(pSt_DBConnector->tszDBName, _T("XEngine_APIInfo"));
_tcsxcpy(pSt_DBConnector->tszDBName, _X("XEngine_APIInfo"));
if (!DataBase_MySQL_Connect(&xhDBSQL, pSt_DBConnector))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_IDCard_Destory
......@@ -64,10 +64,10 @@ XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_Init(DATABASE_MYSQL_CONNECTI
*********************************************************************/
XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_Destory()
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
DataBase_MySQL_Close(xhDBSQL);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_IDCard_QueryRegion
......@@ -89,12 +89,12 @@ XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_Destory()
*********************************************************************/
XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryRegion(XENGINE_IDREGION* pSt_IDRegion, XENGINE_IDCARDINFO* pSt_IDInfo)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
ModuleDatabase_IDCard_QueryProvincer(pSt_IDRegion, pSt_IDInfo);
ModuleDatabase_IDCard_QueryCity(pSt_IDRegion, pSt_IDInfo);
ModuleDatabase_IDCard_QueryCounty(pSt_IDRegion, pSt_IDInfo);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_IDCard_QueryProvincer
......@@ -116,13 +116,13 @@ XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryRegion(XENGINE_IDREGION
*********************************************************************/
XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryProvincer(XENGINE_IDREGION* pSt_IDRegion, XENGINE_IDCARDINFO* pSt_IDInfo)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if ((NULL == pSt_IDRegion) || (NULL == pSt_IDInfo))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
//查询
__int64u nLine = 0;
......@@ -131,24 +131,24 @@ XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryProvincer(XENGINE_IDREG
XCHAR tszSQLStatement[1024];
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
_stprintf(tszSQLStatement, _T("SELECT * FROM `RegionID` WHERE code = '%02d0000'"), pSt_IDInfo->nIDProvince);
_xstprintf(tszSQLStatement, _X("SELECT * FROM `RegionID` WHERE code = '%02d0000'"), pSt_IDInfo->nIDProvince);
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
if (nLine <= 0)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_NOTFOUND;
return XFALSE;
return FALSE;
}
XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
_tcscpy(pSt_IDRegion->tszProvincer, pptszResult[1]);
_tcsxcpy(pSt_IDRegion->tszProvincer, pptszResult[1]);
DataBase_MySQL_FreeResult(xhDBSQL, xhTable);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_IDCard_QueryCity
......@@ -170,13 +170,13 @@ XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryProvincer(XENGINE_IDREG
*********************************************************************/
XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryCity(XENGINE_IDREGION* pSt_IDRegion, XENGINE_IDCARDINFO* pSt_IDInfo)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if ((NULL == pSt_IDRegion) || (NULL == pSt_IDInfo))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
//查询
__int64u nLine = 0;
......@@ -185,24 +185,24 @@ XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryCity(XENGINE_IDREGION*
XCHAR tszSQLStatement[1024];
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
_stprintf(tszSQLStatement, _T("SELECT * FROM `RegionID` WHERE code = '%02d%02d00'"), pSt_IDInfo->nIDProvince, pSt_IDInfo->nIDCity);
_xstprintf(tszSQLStatement, _X("SELECT * FROM `RegionID` WHERE code = '%02d%02d00'"), pSt_IDInfo->nIDProvince, pSt_IDInfo->nIDCity);
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
if (nLine <= 0)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_NOTFOUND;
return XFALSE;
return FALSE;
}
XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
_tcscpy(pSt_IDRegion->tszCity, pptszResult[1]);
_tcsxcpy(pSt_IDRegion->tszCity, pptszResult[1]);
DataBase_MySQL_FreeResult(xhDBSQL, xhTable);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_IDCard_QueryCounty
......@@ -224,13 +224,13 @@ XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryCity(XENGINE_IDREGION*
*********************************************************************/
XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryCounty(XENGINE_IDREGION* pSt_IDRegion, XENGINE_IDCARDINFO* pSt_IDInfo)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if ((NULL == pSt_IDRegion) || (NULL == pSt_IDInfo))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
//查询
__int64u nLine = 0;
......@@ -239,22 +239,22 @@ XBOOL CModuleDatabase_IDCard::ModuleDatabase_IDCard_QueryCounty(XENGINE_IDREGION
XCHAR tszSQLStatement[1024];
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
_stprintf(tszSQLStatement, _T("SELECT * FROM `RegionID` WHERE code = '%02d%02d%02d'"), pSt_IDInfo->nIDProvince, pSt_IDInfo->nIDCity, pSt_IDInfo->nIDCounty);
_xstprintf(tszSQLStatement, _X("SELECT * FROM `RegionID` WHERE code = '%02d%02d%02d'"), pSt_IDInfo->nIDProvince, pSt_IDInfo->nIDCity, pSt_IDInfo->nIDCounty);
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
if (nLine <= 0)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_NOTFOUND;
return XFALSE;
return FALSE;
}
XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
_tcscpy(pSt_IDRegion->tszCounty, pptszResult[1]);
_tcsxcpy(pSt_IDRegion->tszCounty, pptszResult[1]);
DataBase_MySQL_FreeResult(xhDBSQL, xhTable);
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_ShortLink/ModuleDatabase_ShortLink.cpp
浏览文件 @ ee641df1
......@@ -36,23 +36,23 @@ CModuleDatabase_ShortLink::~CModuleDatabase_ShortLink()
*********************************************************************/
XBOOL CModuleDatabase_ShortLink::ModuleDatabase_ShortLink_Init(DATABASE_MYSQL_CONNECTINFO* pSt_DBConnector)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if (NULL == pSt_DBConnector)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
//连接数据库
_tcscpy(pSt_DBConnector->tszDBName, _T("XEngine_APISLink"));
_tcsxcpy(pSt_DBConnector->tszDBName, _X("XEngine_APISLink"));
if (!DataBase_MySQL_Connect(&xhDBSQL, pSt_DBConnector))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_ShortLink_Destory
......@@ -64,10 +64,10 @@ XBOOL CModuleDatabase_ShortLink::ModuleDatabase_ShortLink_Init(DATABASE_MYSQL_CO
*********************************************************************/
XBOOL CModuleDatabase_ShortLink::ModuleDatabase_ShortLink_Destory()
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
DataBase_MySQL_Close(xhDBSQL);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_ShortLink_Insert
......@@ -84,25 +84,25 @@ XBOOL CModuleDatabase_ShortLink::ModuleDatabase_ShortLink_Destory()
*********************************************************************/
XBOOL CModuleDatabase_ShortLink::ModuleDatabase_ShortLink_Insert(XENGINE_SHORTLINK* pSt_SLinkInfo)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if (NULL == pSt_SLinkInfo)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
XCHAR tszSQLStatement[2024];
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
_stprintf(tszSQLStatement, _T("INSERT INTO `XEngine_ShortLink` (tszFullUrl,tszShortUrl,tszKeyUrl,tszMapUrl,tszCreateTime) VALUES('%s','%s','%s','%s','%s')"), pSt_SLinkInfo->tszFullUrl, pSt_SLinkInfo->tszShotUrl, pSt_SLinkInfo->tszKeyUrl, pSt_SLinkInfo->tszMapUrl, pSt_SLinkInfo->tszCreateTime);
_xstprintf(tszSQLStatement, _X("INSERT INTO `XEngine_ShortLink` (tszFullUrl,tszShortUrl,tszKeyUrl,tszMapUrl,tszCreateTime) VALUES('%s','%s','%s','%s','%s')"), pSt_SLinkInfo->tszFullUrl, pSt_SLinkInfo->tszShotUrl, pSt_SLinkInfo->tszKeyUrl, pSt_SLinkInfo->tszMapUrl, pSt_SLinkInfo->tszCreateTime);
if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_ShortLink_Query
......@@ -119,13 +119,13 @@ XBOOL CModuleDatabase_ShortLink::ModuleDatabase_ShortLink_Insert(XENGINE_SHORTLI
*********************************************************************/
XBOOL CModuleDatabase_ShortLink::ModuleDatabase_ShortLink_Query(XENGINE_SHORTLINK* pSt_SLinkInfo)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if ((NULL == pSt_SLinkInfo))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
//查询
XNETHANDLE xhTable = 0;
......@@ -135,18 +135,18 @@ XBOOL CModuleDatabase_ShortLink::ModuleDatabase_ShortLink_Query(XENGINE_SHORTLIN
XCHAR tszSQLStatement[1024];
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
//名称为,消息名为必填
_stprintf_s(tszSQLStatement, _T("SELECT * FROM `XEngine_ShortLink` WHERE tszMapUrl = '%s'"), pSt_SLinkInfo->tszMapUrl);
_xstprintf(tszSQLStatement, _X("SELECT * FROM `XEngine_ShortLink` WHERE tszMapUrl = '%s'"), pSt_SLinkInfo->tszMapUrl);
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nllLine, &nllRow))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
if (nllLine <= 0)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_NOTFOUND;
return XFALSE;
return FALSE;
}
for (__int64u i = 0; i < nllLine; i++)
{
......@@ -154,31 +154,31 @@ XBOOL CModuleDatabase_ShortLink::ModuleDatabase_ShortLink_Query(XENGINE_SHORTLIN
if (NULL != pptszResult[0])
{
pSt_SLinkInfo->nID = _ttoi(pptszResult[0]);
pSt_SLinkInfo->nID = _ttxoi(pptszResult[0]);
}
if (NULL != pptszResult[1])
{
_tcscpy(pSt_SLinkInfo->tszFullUrl, pptszResult[1]);
_tcsxcpy(pSt_SLinkInfo->tszFullUrl, pptszResult[1]);
}
if (NULL != pptszResult[2])
{
_tcscpy(pSt_SLinkInfo->tszShotUrl, pptszResult[2]);
_tcsxcpy(pSt_SLinkInfo->tszShotUrl, pptszResult[2]);
}
if (NULL != pptszResult[3])
{
_tcscpy(pSt_SLinkInfo->tszKeyUrl, pptszResult[3]);
_tcsxcpy(pSt_SLinkInfo->tszKeyUrl, pptszResult[3]);
}
if (NULL != pptszResult[4])
{
_tcscpy(pSt_SLinkInfo->tszMapUrl, pptszResult[4]);
_tcsxcpy(pSt_SLinkInfo->tszMapUrl, pptszResult[4]);
}
if (NULL != pptszResult[5])
{
_tcscpy(pSt_SLinkInfo->tszCreateTime, pptszResult[5]);
_tcsxcpy(pSt_SLinkInfo->tszCreateTime, pptszResult[5]);
}
}
DataBase_MySQL_FreeResult(xhDBSQL, xhTable);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_ShortLink_Delete
......@@ -195,31 +195,31 @@ XBOOL CModuleDatabase_ShortLink::ModuleDatabase_ShortLink_Query(XENGINE_SHORTLIN
*********************************************************************/
XBOOL CModuleDatabase_ShortLink::ModuleDatabase_ShortLink_Delete(XENGINE_SHORTLINK* pSt_SLinkInfo)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if (NULL == pSt_SLinkInfo)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
XCHAR tszSQLStatement[1024];
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
if (_tcslen(pSt_SLinkInfo->tszFullUrl) > 0)
if (_tcsxlen(pSt_SLinkInfo->tszFullUrl) > 0)
{
_stprintf(tszSQLStatement, _T("DELETE FROM `XEngine_ShortLink` WHERE tszFullUrl = '%s'"), pSt_SLinkInfo->tszFullUrl);
_xstprintf(tszSQLStatement, _X("DELETE FROM `XEngine_ShortLink` WHERE tszFullUrl = '%s'"), pSt_SLinkInfo->tszFullUrl);
}
else
{
_stprintf(tszSQLStatement, _T("DELETE FROM `XEngine_ShortLink` WHERE tszMapUrl = '%s'"), pSt_SLinkInfo->tszMapUrl);
_xstprintf(tszSQLStatement, _X("DELETE FROM `XEngine_ShortLink` WHERE tszMapUrl = '%s'"), pSt_SLinkInfo->tszMapUrl);
}
if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_XLog/ModuleDatabase_XLog.cpp
浏览文件 @ ee641df1
......@@ -36,23 +36,23 @@ CModuleDatabase_XLog::~CModuleDatabase_XLog()
*********************************************************************/
XBOOL CModuleDatabase_XLog::ModuleDatabase_XLog_Init(DATABASE_MYSQL_CONNECTINFO* pSt_DBConnector)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if (NULL == pSt_DBConnector)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
//连接数据库
_tcscpy(pSt_DBConnector->tszDBName, _T("XEngine_APILog"));
_tcsxcpy(pSt_DBConnector->tszDBName, _X("XEngine_APILog"));
if (!DataBase_MySQL_Connect(&xhDBSQL, pSt_DBConnector))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_XLog_Destory
......@@ -64,10 +64,10 @@ XBOOL CModuleDatabase_XLog::ModuleDatabase_XLog_Init(DATABASE_MYSQL_CONNECTINFO*
*********************************************************************/
XBOOL CModuleDatabase_XLog::ModuleDatabase_XLog_Destory()
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
DataBase_MySQL_Close(xhDBSQL);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_XLog_Create
......@@ -84,18 +84,18 @@ XBOOL CModuleDatabase_XLog::ModuleDatabase_XLog_Destory()
*********************************************************************/
XBOOL CModuleDatabase_XLog::ModuleDatabase_XLog_Create(LPCXSTR lpszTableName)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if (NULL == lpszTableName)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
XCHAR tszSQLStatement[10240];
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
_stprintf(tszSQLStatement, _T("CREATE TABLE IF NOT EXISTS `%s` ("
_xstprintf(tszSQLStatement, _X("CREATE TABLE IF NOT EXISTS `%s` ("
"`ID` int NOT NULL AUTO_INCREMENT,"
"`tszFileName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件名',"
"`tszFuncName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '函数名',"
......@@ -108,11 +108,11 @@ XBOOL CModuleDatabase_XLog::ModuleDatabase_XLog_Create(LPCXSTR lpszTableName)
if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_XLog_Insert
......@@ -129,25 +129,25 @@ XBOOL CModuleDatabase_XLog::ModuleDatabase_XLog_Create(LPCXSTR lpszTableName)
*********************************************************************/
XBOOL CModuleDatabase_XLog::ModuleDatabase_XLog_Insert(XENGINE_XLOGINFO* pSt_XLogInfo)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if (NULL == pSt_XLogInfo)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
XCHAR tszSQLStatement[11240];
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
_stprintf(tszSQLStatement, _T("INSERT INTO `%s` (tszFileName,tszFuncName,nLogLine,nLogLevel,tszLogBuffer,tszLogTime) VALUES('%s','%s',%d,%d,'%s','%s')"), pSt_XLogInfo->tszTableName, pSt_XLogInfo->st_ProtocolLog.tszFileName, pSt_XLogInfo->st_ProtocolLog.tszFuncName, pSt_XLogInfo->st_ProtocolLog.nLogLine, pSt_XLogInfo->st_ProtocolLog.nLogLevel, pSt_XLogInfo->tszLogBuffer, pSt_XLogInfo->st_ProtocolLog.tszLogTimer);
_xstprintf(tszSQLStatement, _X("INSERT INTO `%s` (tszFileName,tszFuncName,nLogLine,nLogLevel,tszLogBuffer,tszLogTime) VALUES('%s','%s',%d,%d,'%s','%s')"), pSt_XLogInfo->tszTableName, pSt_XLogInfo->st_ProtocolLog.tszFileName, pSt_XLogInfo->st_ProtocolLog.tszFuncName, pSt_XLogInfo->st_ProtocolLog.nLogLine, pSt_XLogInfo->st_ProtocolLog.nLogLevel, pSt_XLogInfo->tszLogBuffer, pSt_XLogInfo->st_ProtocolLog.tszLogTimer);
if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_XLog_Query
......@@ -184,13 +184,13 @@ XBOOL CModuleDatabase_XLog::ModuleDatabase_XLog_Insert(XENGINE_XLOGINFO* pSt_XLo
*********************************************************************/
XBOOL CModuleDatabase_XLog::ModuleDatabase_XLog_Query(XENGINE_XLOGINFO*** pppSt_XLogInfo, int* pInt_ListCount, LPCXSTR lpszTableName, LPCXSTR lpszTimeStart, LPCXSTR lpszTimeEnd)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if ((NULL == lpszTableName) || (NULL == lpszTimeStart) || (NULL == lpszTimeEnd))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
//查询
XNETHANDLE xhTable = 0;
......@@ -200,18 +200,18 @@ XBOOL CModuleDatabase_XLog::ModuleDatabase_XLog_Query(XENGINE_XLOGINFO*** pppSt_
XCHAR tszSQLStatement[1024];
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
//名称为,消息名为必填
_stprintf_s(tszSQLStatement, _T("SELECT * FROM `%s` WHERE tszLogTime BETWEEN '%s' AND '%s'"), lpszTableName, lpszTimeStart, lpszTimeEnd);
_xstprintf(tszSQLStatement, _X("SELECT * FROM `%s` WHERE tszLogTime BETWEEN '%s' AND '%s'"), lpszTableName, lpszTimeStart, lpszTimeEnd);
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nllLine, &nllRow))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
if (nllLine <= 0)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_NOTFOUND;
return XFALSE;
return FALSE;
}
*pInt_ListCount = (int)nllLine;
BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_XLogInfo, (int)nllLine, sizeof(XENGINE_XLOGINFO));
......@@ -219,34 +219,34 @@ XBOOL CModuleDatabase_XLog::ModuleDatabase_XLog_Query(XENGINE_XLOGINFO*** pppSt_
{
XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
_tcscpy((*pppSt_XLogInfo)[i]->tszTableName, lpszTableName);
_tcsxcpy((*pppSt_XLogInfo)[i]->tszTableName, lpszTableName);
if (NULL != pptszResult[1])
{
_tcscpy((*pppSt_XLogInfo)[i]->st_ProtocolLog.tszFileName, pptszResult[1]);
_tcsxcpy((*pppSt_XLogInfo)[i]->st_ProtocolLog.tszFileName, pptszResult[1]);
}
if (NULL != pptszResult[2])
{
_tcscpy((*pppSt_XLogInfo)[i]->st_ProtocolLog.tszFuncName, pptszResult[2]);
_tcsxcpy((*pppSt_XLogInfo)[i]->st_ProtocolLog.tszFuncName, pptszResult[2]);
}
if (NULL != pptszResult[3])
{
(*pppSt_XLogInfo)[i]->st_ProtocolLog.nLogLine = _ttoi(pptszResult[3]);
(*pppSt_XLogInfo)[i]->st_ProtocolLog.nLogLine = _ttxoi(pptszResult[3]);
}
if (NULL != pptszResult[4])
{
(*pppSt_XLogInfo)[i]->st_ProtocolLog.nLogLevel = _ttoi(pptszResult[4]);
(*pppSt_XLogInfo)[i]->st_ProtocolLog.nLogLevel = _ttxoi(pptszResult[4]);
}
if (NULL != pptszResult[5])
{
_tcscpy((*pppSt_XLogInfo)[i]->tszLogBuffer, pptszResult[5]);
_tcsxcpy((*pppSt_XLogInfo)[i]->tszLogBuffer, pptszResult[5]);
}
if (NULL != pptszResult[6])
{
_tcscpy((*pppSt_XLogInfo)[i]->st_ProtocolLog.tszLogTimer, pptszResult[6]);
_tcsxcpy((*pppSt_XLogInfo)[i]->st_ProtocolLog.tszLogTimer, pptszResult[6]);
}
}
DataBase_MySQL_FreeResult(xhDBSQL, xhTable);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_XLog_Delete
......@@ -263,23 +263,23 @@ XBOOL CModuleDatabase_XLog::ModuleDatabase_XLog_Query(XENGINE_XLOGINFO*** pppSt_
*********************************************************************/
XBOOL CModuleDatabase_XLog::ModuleDatabase_XLog_Delete(LPCXSTR lpszTableName)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if (NULL == lpszTableName)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
XCHAR tszSQLStatement[10240];
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
_stprintf(tszSQLStatement, _T("DROP TABLE IF EXISTS '%s'"), lpszTableName);
_xstprintf(tszSQLStatement, _X("DROP TABLE IF EXISTS '%s'"), lpszTableName);
if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_ZIPCode/ModuleDatabase_ZIPCode.cpp
浏览文件 @ ee641df1
......@@ -36,23 +36,23 @@ CModuleDatabase_ZIPCode::~CModuleDatabase_ZIPCode()
*********************************************************************/
XBOOL CModuleDatabase_ZIPCode::ModuleDatabase_ZIPCode_Init(DATABASE_MYSQL_CONNECTINFO* pSt_DBConnector)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if (NULL == pSt_DBConnector)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
//连接数据库
_tcscpy(pSt_DBConnector->tszDBName, _T("XEngine_APIInfo"));
_tcsxcpy(pSt_DBConnector->tszDBName, _X("XEngine_APIInfo"));
if (!DataBase_MySQL_Connect(&xhDBSQL, pSt_DBConnector))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_ZIPCode_Destory
......@@ -64,10 +64,10 @@ XBOOL CModuleDatabase_ZIPCode::ModuleDatabase_ZIPCode_Init(DATABASE_MYSQL_CONNEC
*********************************************************************/
XBOOL CModuleDatabase_ZIPCode::ModuleDatabase_ZIPCode_Destory()
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
DataBase_MySQL_Close(xhDBSQL);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_ZIPCode_QueryZIPCode
......@@ -84,7 +84,7 @@ XBOOL CModuleDatabase_ZIPCode::ModuleDatabase_ZIPCode_Destory()
*********************************************************************/
XBOOL CModuleDatabase_ZIPCode::ModuleDatabase_ZIPCode_QueryZIPCode(XENGINE_ZIPINFO* pSt_ZIPInfo)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
//查询
__int64u nLine = 0;
......@@ -93,46 +93,46 @@ XBOOL CModuleDatabase_ZIPCode::ModuleDatabase_ZIPCode_QueryZIPCode(XENGINE_ZIPIN
XCHAR tszSQLStatement[1024];
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
_stprintf(tszSQLStatement, _T("SELECT * FROM `AdministrativeArea` WHERE zip_code = %d"), pSt_ZIPInfo->nZipCode);
_xstprintf(tszSQLStatement, _X("SELECT * FROM `AdministrativeArea` WHERE zip_code = %d"), pSt_ZIPInfo->nZipCode);
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
if (nLine <= 0)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_NOTFOUND;
return XFALSE;
return FALSE;
}
XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
//三个级别 省->市->区/县
_tcscpy(pSt_ZIPInfo->tszPinYin, pptszResult[6]);
pSt_ZIPInfo->nLevel = _ttoi(pptszResult[5]);
pSt_ZIPInfo->nAreaCode = _ttoi(pptszResult[7]);
pSt_ZIPInfo->dlLng = _ttof(pptszResult[10]);
pSt_ZIPInfo->dlLat = _ttof(pptszResult[11]);
_tcsxcpy(pSt_ZIPInfo->tszPinYin, pptszResult[6]);
pSt_ZIPInfo->nLevel = _ttxoi(pptszResult[5]);
pSt_ZIPInfo->nAreaCode = _ttxoi(pptszResult[7]);
pSt_ZIPInfo->dlLng = _ttxof(pptszResult[10]);
pSt_ZIPInfo->dlLat = _ttxof(pptszResult[11]);
if (3 == pSt_ZIPInfo->nLevel)
{
//获取上级节点
int nParentID = 0;
_tcscpy(pSt_ZIPInfo->tszCounty, pptszResult[2]);
ModuleDatabase_ZIPCode_QueryParentByID(_ttoi(pptszResult[1]), pSt_ZIPInfo->tszCity, &nParentID);
_tcsxcpy(pSt_ZIPInfo->tszCounty, pptszResult[2]);
ModuleDatabase_ZIPCode_QueryParentByID(_ttxoi(pptszResult[1]), pSt_ZIPInfo->tszCity, &nParentID);
ModuleDatabase_ZIPCode_QueryParentByID(nParentID, pSt_ZIPInfo->tszProvincer, &nParentID);
}
else if (2 == pSt_ZIPInfo->nLevel)
{
_tcscpy(pSt_ZIPInfo->tszCity, pptszResult[2]);
ModuleDatabase_ZIPCode_QueryParentByID(_ttoi(pptszResult[1]), pSt_ZIPInfo->tszProvincer);
_tcsxcpy(pSt_ZIPInfo->tszCity, pptszResult[2]);
ModuleDatabase_ZIPCode_QueryParentByID(_ttxoi(pptszResult[1]), pSt_ZIPInfo->tszProvincer);
}
else
{
_tcscpy(pSt_ZIPInfo->tszProvincer, pptszResult[2]);
_tcsxcpy(pSt_ZIPInfo->tszProvincer, pptszResult[2]);
}
DataBase_MySQL_FreeResult(xhDBSQL, xhTable);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_ZIPCode_QueryName
......@@ -149,13 +149,13 @@ XBOOL CModuleDatabase_ZIPCode::ModuleDatabase_ZIPCode_QueryZIPCode(XENGINE_ZIPIN
*********************************************************************/
XBOOL CModuleDatabase_ZIPCode::ModuleDatabase_ZIPCode_QueryName(XENGINE_ZIPINFO* pSt_ZIPInfo)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if (NULL == pSt_ZIPInfo)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
//查询
__int64u nLine = 0;
......@@ -165,52 +165,52 @@ XBOOL CModuleDatabase_ZIPCode::ModuleDatabase_ZIPCode_QueryName(XENGINE_ZIPINFO*
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
if ((_tcslen(pSt_ZIPInfo->tszCounty) > 0) && (_tcslen(pSt_ZIPInfo->tszCity) == 0))
if ((_tcsxlen(pSt_ZIPInfo->tszCounty) > 0) && (_tcsxlen(pSt_ZIPInfo->tszCity) == 0))
{
int nParentID = 0;
ModuleDatabase_ZIPCode_QueryParentByName(pSt_ZIPInfo->tszCounty, &nParentID);
ModuleDatabase_ZIPCode_QueryParentByID(nParentID, pSt_ZIPInfo->tszCity, &nParentID);
ModuleDatabase_ZIPCode_QueryParentByID(nParentID, pSt_ZIPInfo->tszProvincer, &nParentID);
_stprintf(tszSQLStatement, _T("SELECT * FROM `AdministrativeArea` WHERE name = '%s'"), pSt_ZIPInfo->tszCounty);
_xstprintf(tszSQLStatement, _X("SELECT * FROM `AdministrativeArea` WHERE name = '%s'"), pSt_ZIPInfo->tszCounty);
}
else if ((_tcslen(pSt_ZIPInfo->tszCounty) == 0) && (_tcslen(pSt_ZIPInfo->tszCity) > 0))
else if ((_tcsxlen(pSt_ZIPInfo->tszCounty) == 0) && (_tcsxlen(pSt_ZIPInfo->tszCity) > 0))
{
int nParentID = 0;
ModuleDatabase_ZIPCode_QueryParentByName(pSt_ZIPInfo->tszCity, &nParentID);
ModuleDatabase_ZIPCode_QueryParentByID(nParentID, pSt_ZIPInfo->tszProvincer, &nParentID);
_stprintf(tszSQLStatement, _T("SELECT * FROM `AdministrativeArea` WHERE name = '%s'"), pSt_ZIPInfo->tszCity);
_xstprintf(tszSQLStatement, _X("SELECT * FROM `AdministrativeArea` WHERE name = '%s'"), pSt_ZIPInfo->tszCity);
}
else
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_NOTSET;
return XFALSE;
return FALSE;
}
//查询内容
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
if (nLine <= 0)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_NOTFOUND;
return XFALSE;
return FALSE;
}
XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
pSt_ZIPInfo->nLevel = _ttoi(pptszResult[5]);
pSt_ZIPInfo->nAreaCode = _ttoi(pptszResult[7]);
pSt_ZIPInfo->nZipCode = _ttoi(pptszResult[8]);
pSt_ZIPInfo->dlLng = _ttof(pptszResult[10]);
pSt_ZIPInfo->dlLat = _ttof(pptszResult[11]);
_tcscpy(pSt_ZIPInfo->tszPinYin, pptszResult[6]);
pSt_ZIPInfo->nLevel = _ttxoi(pptszResult[5]);
pSt_ZIPInfo->nAreaCode = _ttxoi(pptszResult[7]);
pSt_ZIPInfo->nZipCode = _ttxoi(pptszResult[8]);
pSt_ZIPInfo->dlLng = _ttxof(pptszResult[10]);
pSt_ZIPInfo->dlLat = _ttxof(pptszResult[11]);
_tcsxcpy(pSt_ZIPInfo->tszPinYin, pptszResult[6]);
DataBase_MySQL_FreeResult(xhDBSQL, xhTable);
return XTRUE;
return TRUE;
}
//////////////////////////////////////////////////////////////////////////
// 保护函数
......@@ -240,13 +240,13 @@ XBOOL CModuleDatabase_ZIPCode::ModuleDatabase_ZIPCode_QueryName(XENGINE_ZIPINFO*
*********************************************************************/
XBOOL CModuleDatabase_ZIPCode::ModuleDatabase_ZIPCode_QueryParentByID(int nParentID, XCHAR* ptszParentStr, int* pInt_ParentID /* = NULL */)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if (NULL == ptszParentStr)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
//查询
__int64u nLine = 0;
......@@ -255,29 +255,29 @@ XBOOL CModuleDatabase_ZIPCode::ModuleDatabase_ZIPCode_QueryParentByID(int nParen
XCHAR tszSQLStatement[1024];
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
_stprintf(tszSQLStatement, _T("SELECT * FROM `AdministrativeArea` WHERE id = %d"), nParentID);
_xstprintf(tszSQLStatement, _X("SELECT * FROM `AdministrativeArea` WHERE id = %d"), nParentID);
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
if (nLine <= 0)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_NOTFOUND;
return XFALSE;
return FALSE;
}
XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
if (NULL != pInt_ParentID)
{
*pInt_ParentID = _ttoi(pptszResult[1]);
*pInt_ParentID = _ttxoi(pptszResult[1]);
}
_tcscpy(ptszParentStr, pptszResult[3]);
_tcsxcpy(ptszParentStr, pptszResult[3]);
DataBase_MySQL_FreeResult(xhDBSQL, xhTable);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleDatabase_ZIPCode_QueryParentByName
......@@ -299,13 +299,13 @@ XBOOL CModuleDatabase_ZIPCode::ModuleDatabase_ZIPCode_QueryParentByID(int nParen
*********************************************************************/
XBOOL CModuleDatabase_ZIPCode::ModuleDatabase_ZIPCode_QueryParentByName(LPCXSTR lpszName, int* pInt_ParentID /* = NULL */)
{
DBModule_IsErrorOccur = XFALSE;
DBModule_IsErrorOccur = FALSE;
if (NULL == lpszName)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_PARAMENT;
return XFALSE;
return FALSE;
}
//查询
__int64u nLine = 0;
......@@ -314,24 +314,24 @@ XBOOL CModuleDatabase_ZIPCode::ModuleDatabase_ZIPCode_QueryParentByName(LPCXSTR
XCHAR tszSQLStatement[1024];
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
_stprintf(tszSQLStatement, _T("SELECT * FROM `AdministrativeArea` WHERE name = '%s'"), lpszName);
_xstprintf(tszSQLStatement, _X("SELECT * FROM `AdministrativeArea` WHERE name = '%s'"), lpszName);
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nLine, &nRow))
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = DataBase_GetLastError();
return XFALSE;
return FALSE;
}
if (nLine <= 0)
{
DBModule_IsErrorOccur = XTRUE;
DBModule_IsErrorOccur = TRUE;
DBModule_dwErrorCode = ERROR_APISERVICE_MODULE_DATABASE_NOTFOUND;
return XFALSE;
return FALSE;
}
XCHAR** pptszResult = DataBase_MySQL_GetResult(xhDBSQL, xhTable);
if (NULL != pInt_ParentID)
{
*pInt_ParentID = _ttoi(pptszResult[1]);
*pInt_ParentID = _ttxoi(pptszResult[1]);
}
DataBase_MySQL_FreeResult(xhDBSQL, xhTable);
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_ModuleDatabase/XEngine_ModuleDatabase.vcxproj
浏览文件 @ ee641df1
......@@ -30,27 +30,27 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
......
XEngine_Source/XEngine_ModuleDatabase/dllmain.cpp
浏览文件 @ ee641df1
......@@ -14,6 +14,6 @@ XBOOL APIENTRY DllMain( HMODULE hModule,
case DLL_PROCESS_DETACH:
break;
}
return XTRUE;
return TRUE;
}
XEngine_Source/XEngine_ModuleDatabase/pch.cpp
浏览文件 @ ee641df1
......@@ -15,7 +15,7 @@
// Purpose: 导出函数实现
// History:
*********************************************************************/
XLONG DBModule_IsErrorOccur = XFALSE;
XLONG DBModule_IsErrorOccur = FALSE;
XBOOL DBModule_dwErrorCode = 0;
//////////////////////////////////////////////////////////////////////////
CModuleDatabase_IDCard m_IDCard;
......
XEngine_Source/XEngine_ModuleHelp/ModuleHelp_Define.h
浏览文件 @ ee641df1
......@@ -617,7 +617,7 @@ extern "C" XBOOL ModuleHelp_SocketTest_StopConnect(XNETHANDLE xhToken);
意思：是否成功
备注：
*********************************************************************/
extern "C" XBOOL ModuleHelp_SocketTest_StartDatas(XNETHANDLE* pxhToken, MODULEHELP_SOCKETTEST_DATAS* pSt_SocketDatas, CALLBACK_APISERVICE_MODULE_HELP_SOCKETTEST fpCall_DataTest, XBOOL bTCP = XTRUE, XPVOID lParam = NULL);
extern "C" XBOOL ModuleHelp_SocketTest_StartDatas(XNETHANDLE* pxhToken, MODULEHELP_SOCKETTEST_DATAS* pSt_SocketDatas, CALLBACK_APISERVICE_MODULE_HELP_SOCKETTEST fpCall_DataTest, XBOOL bTCP = TRUE, XPVOID lParam = NULL);
/********************************************************************
函数名称：ModuleHelp_SocketTest_GetDatas
函数功能：获取是否在处理中
......
XEngine_Source/XEngine_ModuleHelp/ModuleHelp_IDCard/ModuleHelp_IDCard.cpp
浏览文件 @ ee641df1
......@@ -36,33 +36,33 @@ CModuleHelp_IDCard::~CModuleHelp_IDCard()
*********************************************************************/
XBOOL CModuleHelp_IDCard::ModuleHelp_IDCard_CheckBirth(XENGINE_IDCARDINFO *pSt_IDInfo)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
if (NULL == pSt_IDInfo)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_IDCARD_PARAMENT;
return XFALSE;
return FALSE;
}
if (pSt_IDInfo->nBirthYear < 1949 || pSt_IDInfo->nBirthYear > 2999)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_IDCARD_FMT;
return XFALSE;
return FALSE;
}
if (pSt_IDInfo->nBirthMonth < 1 || pSt_IDInfo->nBirthMonth > 12)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_IDCARD_FMT;
return XFALSE;
return FALSE;
}
if (pSt_IDInfo->nBirthDay < 1 || pSt_IDInfo->nBirthDay > 31)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_IDCARD_FMT;
return XFALSE;
return FALSE;
}
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleHelp_IDCard_CheckBirth
......@@ -79,13 +79,13 @@ XBOOL CModuleHelp_IDCard::ModuleHelp_IDCard_CheckBirth(XENGINE_IDCARDINFO *pSt_I
*********************************************************************/
XBOOL CModuleHelp_IDCard::ModuleHelp_IDCard_CheckSum(XENGINE_IDCARDINFO* pSt_IDInfo)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
if (NULL == pSt_IDInfo)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_IDCARD_PARAMENT;
return XFALSE;
return FALSE;
}
int nCheck = 0;
int nIDArray[18];
......@@ -103,9 +103,9 @@ XBOOL CModuleHelp_IDCard::ModuleHelp_IDCard_CheckSum(XENGINE_IDCARDINFO* pSt_IDI
}
if ((nIDArray[17] != nTable[nCheck % 11]) && (pSt_IDInfo->nCheck != 'x' || nTable[nCheck % 11] != 2))
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_IDCARD_SUM;
return XFALSE;
return FALSE;
}
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_ModuleHelp/ModuleHelp_Language/ModuleHelp_Language.cpp
浏览文件 @ ee641df1
......@@ -46,30 +46,30 @@ CModuleHelp_Language::~CModuleHelp_Language()
*********************************************************************/
XBOOL CModuleHelp_Language::ModuleHelp_Language_ConvertZh(LPCXSTR lpszJsonFile, LPCXSTR lpszSourceStr, XCHAR* ptszDestStr)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
if ((NULL == lpszJsonFile) || (NULL == lpszSourceStr) || (NULL == ptszDestStr))
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_LANGUAGE_PARAMENT;
return XFALSE;
return FALSE;
}
opencc_t m_OPencc = opencc_open(lpszJsonFile);
if ((opencc_t)-1 == m_OPencc)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_LANGUAGE_FAILED;
return XFALSE;
return FALSE;
}
if ((size_t)-1 == opencc_convert_utf8_to_buffer(m_OPencc, lpszSourceStr, strlen(lpszSourceStr), ptszDestStr))
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_LANGUAGE_NOTSUPPORT;
return XFALSE;
return FALSE;
}
opencc_close(m_OPencc);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleHelp_Translation_Convert
......@@ -91,72 +91,72 @@ XBOOL CModuleHelp_Language::ModuleHelp_Language_ConvertZh(LPCXSTR lpszJsonFile,
*********************************************************************/
XBOOL CModuleHelp_Language::ModuleHelp_Translation_Convert(ENUM_XENGINE_APISERVICE_TRANSLATION_TYPE enTranslationType, XCHAR* ptszTranslationType)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
if (NULL == ptszTranslationType)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_LANGUAGE_PARAMENT;
return XFALSE;
return FALSE;
}
//转换为服务需要的类型
if (ENUM_XENGINE_APISERVICE_TRANSLATION_TYPE_AUTO == enTranslationType)
{
_tcscpy(ptszTranslationType, _T("auto"));
_tcsxcpy(ptszTranslationType, _X("auto"));
}
else if (ENUM_XENGINE_APISERVICE_TRANSLATION_TYPE_ZH_CN2EN == enTranslationType)
{
_tcscpy(ptszTranslationType, _T("ZH_CN2EN"));
_tcsxcpy(ptszTranslationType, _X("ZH_CN2EN"));
}
else if (ENUM_XENGINE_APISERVICE_TRANSLATION_TYPE_ZH_CN2JA == enTranslationType)
{
_tcscpy(ptszTranslationType, _T("ZH_CN2JA"));
_tcsxcpy(ptszTranslationType, _X("ZH_CN2JA"));
}
else if (ENUM_XENGINE_APISERVICE_TRANSLATION_TYPE_ZH_CN2KR == enTranslationType)
{
_tcscpy(ptszTranslationType, _T("ZH_CN2KR"));
_tcsxcpy(ptszTranslationType, _X("ZH_CN2KR"));
}
else if (ENUM_XENGINE_APISERVICE_TRANSLATION_TYPE_ZH_CN2FR == enTranslationType)
{
_tcscpy(ptszTranslationType, _T("ZH_CN2FR"));
_tcsxcpy(ptszTranslationType, _X("ZH_CN2FR"));
}
else if (ENUM_XENGINE_APISERVICE_TRANSLATION_TYPE_ZH_CN2RU == enTranslationType)
{
_tcscpy(ptszTranslationType, _T("ZH_CN2RU"));
_tcsxcpy(ptszTranslationType, _X("ZH_CN2RU"));
}
else if (ENUM_XENGINE_APISERVICE_TRANSLATION_TYPE_ZH_CN2SP == enTranslationType)
{
_tcscpy(ptszTranslationType, _T("ZH_CN2SP"));
_tcsxcpy(ptszTranslationType, _X("ZH_CN2SP"));
}
else if (ENUM_XENGINE_APISERVICE_TRANSLATION_TYPE_EN2ZH_CN == enTranslationType)
{
_tcscpy(ptszTranslationType, _T("EN2ZH_CN"));
_tcsxcpy(ptszTranslationType, _X("EN2ZH_CN"));
}
else if (ENUM_XENGINE_APISERVICE_TRANSLATION_TYPE_JA2ZH_CN == enTranslationType)
{
_tcscpy(ptszTranslationType, _T("JA2ZH_CN"));
_tcsxcpy(ptszTranslationType, _X("JA2ZH_CN"));
}
else if (ENUM_XENGINE_APISERVICE_TRANSLATION_TYPE_KR2ZH_CN == enTranslationType)
{
_tcscpy(ptszTranslationType, _T("KR2ZH_CN"));
_tcsxcpy(ptszTranslationType, _X("KR2ZH_CN"));
}
else if (ENUM_XENGINE_APISERVICE_TRANSLATION_TYPE_FR2ZH_CN == enTranslationType)
{
_tcscpy(ptszTranslationType, _T("FR2ZH_CN"));
_tcsxcpy(ptszTranslationType, _X("FR2ZH_CN"));
}
else if (ENUM_XENGINE_APISERVICE_TRANSLATION_TYPE_RU2ZH_CN == enTranslationType)
{
_tcscpy(ptszTranslationType, _T("RU2ZH_CN"));
_tcsxcpy(ptszTranslationType, _X("RU2ZH_CN"));
}
else if (ENUM_XENGINE_APISERVICE_TRANSLATION_TYPE_SP2ZH_CN == enTranslationType)
{
_tcscpy(ptszTranslationType, _T("SP2ZH_CN"));
_tcsxcpy(ptszTranslationType, _X("SP2ZH_CN"));
}
else
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_LANGUAGE_NOTSUPPORT;
return XFALSE;
return FALSE;
}
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_ModuleHelp/ModuleHelp_Locker/ModuleHelp_Locker.cpp
浏览文件 @ ee641df1
......@@ -36,20 +36,20 @@ CModuleHelp_Locker::~CModuleHelp_Locker()
*********************************************************************/
XBOOL CModuleHelp_Locker::ModuleHelp_Locker_Create(XNETHANDLE* pxhToken)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
if (NULL == pxhToken)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_LOCK_PARAMENT;
return XFALSE;
return FALSE;
}
MODULEHELP_LOCKINFO *pSt_LockInfo = new MODULEHELP_LOCKINFO;
if (NULL == pSt_LockInfo)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_LOCK_MALLOC;
return XFALSE;
return FALSE;
}
pSt_LockInfo->enLockStatus = ENUM_MODULEHELP_LOCKSTATUS_NOTUSED;
......@@ -58,7 +58,7 @@ XBOOL CModuleHelp_Locker::ModuleHelp_Locker_Create(XNETHANDLE* pxhToken)
st_Locker.lock();
stl_MapLocker.insert(make_pair(*pxhToken, pSt_LockInfo));
st_Locker.unlock();
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleHelp_Locker_OPen
......@@ -75,33 +75,33 @@ XBOOL CModuleHelp_Locker::ModuleHelp_Locker_Create(XNETHANDLE* pxhToken)
*********************************************************************/
XBOOL CModuleHelp_Locker::ModuleHelp_Locker_OPen(XNETHANDLE xhToken)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
//看看存在不存在
st_Locker.lock_shared();
auto stl_MapIterator = stl_MapLocker.find(xhToken);
if (stl_MapIterator != stl_MapLocker.end())
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_LOCK_EXIST;
st_Locker.unlock_shared();
return XFALSE;
return FALSE;
}
st_Locker.unlock_shared();
//不存在插入
MODULEHELP_LOCKINFO* pSt_LockInfo = new MODULEHELP_LOCKINFO;
if (NULL == pSt_LockInfo)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_LOCK_MALLOC;
return XFALSE;
return FALSE;
}
pSt_LockInfo->enLockStatus = ENUM_MODULEHELP_LOCKSTATUS_NOTUSED;
st_Locker.lock();
stl_MapLocker.insert(make_pair(xhToken, pSt_LockInfo));
st_Locker.unlock();
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleHelp_Locker_ReadLock
......@@ -118,31 +118,31 @@ XBOOL CModuleHelp_Locker::ModuleHelp_Locker_OPen(XNETHANDLE xhToken)
*********************************************************************/
XBOOL CModuleHelp_Locker::ModuleHelp_Locker_ReadLock(XNETHANDLE xhToken)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
//看看存在不存在
st_Locker.lock_shared();
auto stl_MapIterator = stl_MapLocker.find(xhToken);
if (stl_MapIterator == stl_MapLocker.end())
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_LOCK_NOTFOUND;
st_Locker.unlock_shared();
return XFALSE;
return FALSE;
}
//判断锁状态,如果是写,返回错误
if (ENUM_MODULEHELP_LOCKSTATUS_WRITE == stl_MapIterator->second->enLockStatus)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_LOCK_LOCKED;
st_Locker.unlock_shared();
return XFALSE;
return FALSE;
}
//没有加锁,开始加锁
stl_MapIterator->second->enLockStatus = ENUM_MODULEHELP_LOCKSTATUS_READ;
st_Locker.unlock_shared();
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleHelp_Locker_ReadUNLock
......@@ -159,30 +159,30 @@ XBOOL CModuleHelp_Locker::ModuleHelp_Locker_ReadLock(XNETHANDLE xhToken)
*********************************************************************/
XBOOL CModuleHelp_Locker::ModuleHelp_Locker_ReadUNLock(XNETHANDLE xhToken)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
//看看存在不存在
st_Locker.lock_shared();
auto stl_MapIterator = stl_MapLocker.find(xhToken);
if (stl_MapIterator == stl_MapLocker.end())
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_LOCK_NOTFOUND;
st_Locker.unlock_shared();
return XFALSE;
return FALSE;
}
//是不是READ锁定,不是返回错误
if (ENUM_MODULEHELP_LOCKSTATUS_READ != stl_MapIterator->second->enLockStatus)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_LOCK_STATUS;
st_Locker.unlock_shared();
return XFALSE;
return FALSE;
}
stl_MapIterator->second->enLockStatus = ENUM_MODULEHELP_LOCKSTATUS_NOTUSED;
st_Locker.unlock_shared();
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleHelp_Locker_WriteLock
......@@ -199,30 +199,30 @@ XBOOL CModuleHelp_Locker::ModuleHelp_Locker_ReadUNLock(XNETHANDLE xhToken)
*********************************************************************/
XBOOL CModuleHelp_Locker::ModuleHelp_Locker_WriteLock(XNETHANDLE xhToken)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
//看看存在不存在
st_Locker.lock_shared();
auto stl_MapIterator = stl_MapLocker.find(xhToken);
if (stl_MapIterator == stl_MapLocker.end())
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_LOCK_NOTFOUND;
st_Locker.unlock_shared();
return XFALSE;
return FALSE;
}
//有没有锁定状态
if ((ENUM_MODULEHELP_LOCKSTATUS_READ == stl_MapIterator->second->enLockStatus) || (ENUM_MODULEHELP_LOCKSTATUS_WRITE == stl_MapIterator->second->enLockStatus))
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_LOCK_LOCKED;
st_Locker.unlock_shared();
return XFALSE;
return FALSE;
}
stl_MapIterator->second->enLockStatus = ENUM_MODULEHELP_LOCKSTATUS_WRITE;
st_Locker.unlock_shared();
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleHelp_Locker_WriteUNLock
......@@ -239,30 +239,30 @@ XBOOL CModuleHelp_Locker::ModuleHelp_Locker_WriteLock(XNETHANDLE xhToken)
*********************************************************************/
XBOOL CModuleHelp_Locker::ModuleHelp_Locker_WriteUNLock(XNETHANDLE xhToken)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
//看看存在不存在
st_Locker.lock_shared();
auto stl_MapIterator = stl_MapLocker.find(xhToken);
if (stl_MapIterator == stl_MapLocker.end())
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_LOCK_NOTFOUND;
st_Locker.unlock_shared();
return XFALSE;
return FALSE;
}
//有没有锁定状态
if (ENUM_MODULEHELP_LOCKSTATUS_WRITE == stl_MapIterator->second->enLockStatus)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_LOCK_STATUS;
st_Locker.unlock_shared();
return XFALSE;
return FALSE;
}
stl_MapIterator->second->enLockStatus = ENUM_MODULEHELP_LOCKSTATUS_NOTUSED;
st_Locker.unlock_shared();
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleHelp_Locker_Close
......@@ -279,7 +279,7 @@ XBOOL CModuleHelp_Locker::ModuleHelp_Locker_WriteUNLock(XNETHANDLE xhToken)
*********************************************************************/
XBOOL CModuleHelp_Locker::ModuleHelp_Locker_Close(XNETHANDLE xhToken)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
//看看存在不存在
st_Locker.lock();
......@@ -291,5 +291,5 @@ XBOOL CModuleHelp_Locker::ModuleHelp_Locker_Close(XNETHANDLE xhToken)
stl_MapLocker.erase(stl_MapIterator);
}
st_Locker.unlock();
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_ModuleHelp/ModuleHelp_QRCode/ModuleHelp_QRCode.cpp
浏览文件 @ ee641df1
......@@ -43,27 +43,22 @@ CModuleHelp_QRCode::~CModuleHelp_QRCode()
*********************************************************************/
XBOOL CModuleHelp_QRCode::ModuleHelp_QRCode_QREncodecFile(LPCXSTR lpszFileName, LPCXSTR lpszMsgBuffer)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
if ((NULL == lpszFileName) || (NULL == lpszMsgBuffer))
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_QRCODE_PARAMENT;
return XFALSE;
return FALSE;
}
#ifdef _MSC_BUILD
//使用qrencode进行字符串编码
#ifdef _UNICODE
USES_CONVERSION;
QRcode* pSt_QRCodec = QRcode_encodeString(W2A(lpszMsgBuffer), 0, QR_ECLEVEL_H, QR_MODE_8, 1);
#else
QRcode* pSt_QRCodec = QRcode_encodeString(lpszMsgBuffer, 0, QR_ECLEVEL_H, QR_MODE_8, 1);
#endif
if (NULL == pSt_QRCodec)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_QRCODE_FAILED;
return XFALSE;
return FALSE;
}
cv::Mat m_SrcFrame;
//转换数据
......@@ -79,23 +74,18 @@ XBOOL CModuleHelp_QRCode::ModuleHelp_QRCode_QREncodecFile(LPCXSTR lpszFileName,
cv::resize(m_SrcFrame, m_SrcFrame, cv::Size(m_SrcFrame.rows * 10, m_SrcFrame.cols * 10), 0, 0, cv::INTER_NEAREST);
//转换成彩色
cv::cvtColor(m_SrcFrame, m_SrcFrame, cv::COLOR_GRAY2BGR);
#ifdef _UNICODE
//USES_CONVERSION;
if (!cv::imwrite(W2A(lpszFileName), m_SrcFrame))
#else
if (!cv::imwrite(lpszFileName, m_SrcFrame))
#endif
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_QRCODE_WRITE;
return XFALSE;
return FALSE;
}
#else
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_QRCODE_NOTSUPPORT;
return XFALSE;
return FALSE;
#endif
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleHelp_QRCode_QREncodecMemory
......@@ -127,27 +117,22 @@ XBOOL CModuleHelp_QRCode::ModuleHelp_QRCode_QREncodecFile(LPCXSTR lpszFileName,
*********************************************************************/
XBOOL CModuleHelp_QRCode::ModuleHelp_QRCode_QREncodecMemory(LPCXSTR lpszMsgBuffer, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszFmt)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
if ((NULL == lpszMsgBuffer) || (NULL == ptszMsgBuffer))
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_QRCODE_PARAMENT;
return XFALSE;
return FALSE;
}
#ifdef _MSC_BUILD
//使用qrencode进行字符串编码
#ifdef _UNICODE
USES_CONVERSION;
QRcode* pSt_QRCodec = QRcode_encodeString(W2A(lpszMsgBuffer), 0, QR_ECLEVEL_H, QR_MODE_8, 1);
#else
QRcode* pSt_QRCodec = QRcode_encodeString(lpszMsgBuffer, 0, QR_ECLEVEL_H, QR_MODE_8, 1);
#endif
if (NULL == pSt_QRCodec)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_QRCODE_FAILED;
return XFALSE;
return FALSE;
}
cv::Mat m_SrcFrame;
vector<uchar> stl_VecImg;
......@@ -167,9 +152,9 @@ XBOOL CModuleHelp_QRCode::ModuleHelp_QRCode_QREncodecMemory(LPCXSTR lpszMsgBuffe
//是否成功
if (!cv::imencode(lpszFmt, m_SrcFrame, stl_VecImg))
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_QRCODE_FAILED;
return XFALSE;
return FALSE;
}
*pInt_MsgLen = stl_VecImg.size();
for (int i = 0; i < (*pInt_MsgLen); i++)
......@@ -177,11 +162,11 @@ XBOOL CModuleHelp_QRCode::ModuleHelp_QRCode_QREncodecMemory(LPCXSTR lpszMsgBuffe
ptszMsgBuffer[i] = stl_VecImg[i];
}
#else
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_QRCODE_NOTSUPPORT;
return XFALSE;
return FALSE;
#endif
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleHelp_QRCode_QRDecodecFile
......@@ -223,56 +208,42 @@ XBOOL CModuleHelp_QRCode::ModuleHelp_QRCode_QREncodecMemory(LPCXSTR lpszMsgBuffe
*********************************************************************/
XBOOL CModuleHelp_QRCode::ModuleHelp_QRCode_QRDecodecFile(LPCXSTR lpszFileName, XCHAR* ptszMsgBuffer, LPCXSTR lpszDetectProto, LPCXSTR lpszDetectModel, LPCXSTR lpszSrProto, LPCXSTR lpszSrModel)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
if ((NULL == lpszFileName) || (NULL == ptszMsgBuffer))
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_QRCODE_PARAMENT;
return XFALSE;
return FALSE;
}
#ifdef _MSC_BUILD
cv::Mat m_Frame;
vector<cv::Mat> m_MatPoint;
cv::Ptr<cv::wechat_qrcode::WeChatQRCode> m_QRDetector;
#ifdef _UNICODE
USES_CONVERSION;
m_Frame = cv::imread(W2A(lpszFileName));
#else
m_Frame = cv::imread(lpszFileName);
#endif // _UNICODE
//是否成功
if (m_Frame.empty())
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_QRCODE_EMPTY;
return XFALSE;
return FALSE;
}
#ifdef _UNICODE
m_QRDetector = cv::makePtr<cv::wechat_qrcode::WeChatQRCode>(W2A(lpszDetectProto), W2A(lpszDetectModel), W2A(lpszSrProto), W2A(lpszSrModel));
#else
m_QRDetector = cv::makePtr<cv::wechat_qrcode::WeChatQRCode>(lpszDetectProto, lpszDetectModel, lpszSrProto, lpszSrModel);
#endif
vector<string> stl_VectorQRList = m_QRDetector->detectAndDecode(m_Frame, m_MatPoint);
if (stl_VectorQRList.empty())
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_QRCODE_NOTQR;
return XFALSE;
return FALSE;
}
#ifdef _UNICODE
wcscpy(ptszMsgBuffer, A2W(stl_VectorQRList[0].c_str()));
#else
strcpy(ptszMsgBuffer, stl_VectorQRList[0].c_str());
#endif
#else
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_QRCODE_NOTSUPPORT;
return XFALSE;
return FALSE;
#endif
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleHelp_QRCode_QRDecodecMemory
......@@ -319,13 +290,13 @@ XBOOL CModuleHelp_QRCode::ModuleHelp_QRCode_QRDecodecFile(LPCXSTR lpszFileName,
*********************************************************************/
XBOOL CModuleHelp_QRCode::ModuleHelp_QRCode_QRDecodecMemory(LPCXSTR lpszMsgBuffer, int nMsgLen, XCHAR* ptszMsgBuffer, LPCXSTR lpszDetectProto, LPCXSTR lpszDetectModel, LPCXSTR lpszSrProto, LPCXSTR lpszSrModel)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
if ((NULL == lpszMsgBuffer) || (NULL == ptszMsgBuffer))
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_QRCODE_PARAMENT;
return XFALSE;
return FALSE;
}
#ifdef _MSC_BUILD
cv::Mat m_Frame;
......@@ -337,33 +308,24 @@ XBOOL CModuleHelp_QRCode::ModuleHelp_QRCode_QRDecodecMemory(LPCXSTR lpszMsgBuffe
//是否成功
if (m_Frame.empty())
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_QRCODE_EMPTY;
return XFALSE;
return FALSE;
}
#ifdef _UNICODE
USES_CONVERSION;
m_QRDetector = cv::makePtr<cv::wechat_qrcode::WeChatQRCode>(W2A(lpszDetectProto), W2A(lpszDetectModel), W2A(lpszSrProto), W2A(lpszSrModel));
#else
m_QRDetector = cv::makePtr<cv::wechat_qrcode::WeChatQRCode>(lpszDetectProto, lpszDetectModel, lpszSrProto, lpszSrModel);
#endif
vector<string> stl_VectorQRList = m_QRDetector->detectAndDecode(m_Frame, m_MatPoint);
if (stl_VectorQRList.empty())
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_QRCODE_NOTQR;
return XFALSE;
return FALSE;
}
#ifdef _UNICODE
wcscpy(ptszMsgBuffer, A2W(stl_VectorQRList[0].c_str()));
#else
strcpy(ptszMsgBuffer, stl_VectorQRList[0].c_str());
#endif
#else
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_QRCODE_NOTSUPPORT;
return XFALSE;
return FALSE;
#endif
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_ModuleHelp/ModuleHelp_SocketTest/ModuleHelp_SocketTest.cpp
浏览文件 @ ee641df1
......@@ -50,24 +50,24 @@ CModuleHelp_SocketTest::~CModuleHelp_SocketTest()
*********************************************************************/
XBOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_StartConnect(XNETHANDLE* pxhToken, MODULEHELP_SOCKETTEST_RECONNECT* pSt_ReConnect, CALLBACK_APISERVICE_MODULE_HELP_SOCKETTEST fpCall_ReConnect, XPVOID lParam /* = NULL */)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
if ((NULL == pSt_ReConnect) || (NULL == fpCall_ReConnect))
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_SOCKETTEST_PARAMRT;
return XFALSE;
return FALSE;
}
MODULEHELP_SOCKETTEST_CONNINFO* pSt_ConnSocket = new MODULEHELP_SOCKETTEST_CONNINFO;
if (NULL == pSt_ConnSocket)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_SOCKETTEST_MALLOC;
return XFALSE;
return FALSE;
}
memset(pSt_ConnSocket, '\0', sizeof(MODULEHELP_SOCKETTEST_CONNINFO));
//结构体赋值
pSt_ConnSocket->bIsRun = XTRUE;
pSt_ConnSocket->bIsRun = TRUE;
pSt_ConnSocket->lParam = lParam;
pSt_ConnSocket->lpCall_ReConnect = fpCall_ReConnect;
BaseLib_OperatorHandle_Create(&pSt_ConnSocket->xhToken);
......@@ -76,15 +76,15 @@ XBOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_StartConnect(XNETHANDLE* pxh
pSt_ConnSocket->pSTDThread = make_shared<std::thread>(ModuleHelp_SocketTest_ThreadConn, pSt_ConnSocket);
if (NULL == pSt_ConnSocket->pSTDThread)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_SOCKETTEST_THREAD;
return XFALSE;
return FALSE;
}
*pxhToken = pSt_ConnSocket->xhToken;
st_LockConn.lock();
stl_MapConnTest.insert(make_pair(pSt_ConnSocket->xhToken, pSt_ConnSocket));
st_LockConn.unlock();
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleHelp_SocketTest_GetConnect
......@@ -106,20 +106,20 @@ XBOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_StartConnect(XNETHANDLE* pxh
*********************************************************************/
XBOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_GetConnect(XNETHANDLE xhToken, XBOOL* pbRun)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
st_LockConn.lock_shared();
unordered_map<XNETHANDLE, MODULEHELP_SOCKETTEST_CONNINFO*>::iterator stl_MapIterator = stl_MapConnTest.find(xhToken);
if (stl_MapIterator == stl_MapConnTest.end())
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_SOCKETTEST_NOTFOUND;
st_LockConn.unlock_shared();
return XFALSE;
return FALSE;
}
*pbRun = stl_MapIterator->second->bIsRun;
st_LockConn.unlock_shared();
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleHelp_SocketTest_StopConnect
......@@ -136,13 +136,13 @@ XBOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_GetConnect(XNETHANDLE xhToke
*********************************************************************/
XBOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_StopConnect(XNETHANDLE xhToken)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
st_LockConn.lock();
unordered_map<XNETHANDLE, MODULEHELP_SOCKETTEST_CONNINFO*>::iterator stl_MapIterator = stl_MapConnTest.find(xhToken);
if (stl_MapIterator != stl_MapConnTest.end())
{
stl_MapIterator->second->bIsRun = XFALSE;
stl_MapIterator->second->bIsRun = FALSE;
stl_MapIterator->second->pSTDThread->join();
if (NULL != stl_MapIterator->second->lParam)
......@@ -157,7 +157,7 @@ XBOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_StopConnect(XNETHANDLE xhTok
stl_MapConnTest.erase(stl_MapIterator);
}
st_LockConn.unlock();
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleHelp_SocketTest_StartDatas
......@@ -187,24 +187,24 @@ XBOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_StopConnect(XNETHANDLE xhTok
意思：是否成功
备注：
*********************************************************************/
XBOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_StartDatas(XNETHANDLE* pxhToken, MODULEHELP_SOCKETTEST_DATAS* pSt_SocketDatas, CALLBACK_APISERVICE_MODULE_HELP_SOCKETTEST fpCall_DataTest, XBOOL bTCP /* = XTRUE */, XPVOID lParam /* = NULL */)
XBOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_StartDatas(XNETHANDLE* pxhToken, MODULEHELP_SOCKETTEST_DATAS* pSt_SocketDatas, CALLBACK_APISERVICE_MODULE_HELP_SOCKETTEST fpCall_DataTest, XBOOL bTCP /* = TRUE */, XPVOID lParam /* = NULL */)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
if ((NULL == pSt_SocketDatas) || (NULL == fpCall_DataTest))
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_SOCKETTEST_PARAMRT;
return XFALSE;
return FALSE;
}
MODULEHELP_SOCKETTEST_DATAINFO *pSt_DataSocket = new MODULEHELP_SOCKETTEST_DATAINFO;
if (NULL == pSt_DataSocket)
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_SOCKETTEST_MALLOC;
return XFALSE;
return FALSE;
}
pSt_DataSocket->bIsRun = XTRUE;
pSt_DataSocket->bIsRun = TRUE;
pSt_DataSocket->bIsTCP = bTCP;
pSt_DataSocket->lParam = lParam;
pSt_DataSocket->lpCall_TestDatas = fpCall_DataTest;
......@@ -215,33 +215,33 @@ XBOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_StartDatas(XNETHANDLE* pxhTo
{
if (!XClient_TCPSelect_Create(&pSt_DataSocket->hSocket, pSt_SocketDatas->st_REConnect.tszAddr, pSt_SocketDatas->st_REConnect.nPort))
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = XClient_GetLastError();
return XFALSE;
return FALSE;
}
}
else
{
if (!XClient_UDPSelect_Create(&pSt_DataSocket->hSocket))
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = XClient_GetLastError();
return XFALSE;
return FALSE;
}
}
//创建线程
pSt_DataSocket->pSTDThread = make_shared<std::thread>(ModuleHelp_SocketTest_ThreadData, pSt_DataSocket);
if (!pSt_DataSocket->pSTDThread->joinable())
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_SOCKETTEST_THREAD;
return XFALSE;
return FALSE;
}
*pxhToken = pSt_DataSocket->xhToken;
st_LockData.lock();
stl_MapDataTest.insert(make_pair(pSt_DataSocket->xhToken, pSt_DataSocket));
st_LockData.unlock();
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleHelp_SocketTest_GetDatas
......@@ -263,20 +263,20 @@ XBOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_StartDatas(XNETHANDLE* pxhTo
*********************************************************************/
XBOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_GetDatas(XNETHANDLE xhToken, XBOOL* pbRun)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
st_LockData.lock_shared();
unordered_map<XNETHANDLE, MODULEHELP_SOCKETTEST_DATAINFO*>::iterator stl_MapIterator = stl_MapDataTest.find(xhToken);
if (stl_MapIterator == stl_MapDataTest.end())
{
ModuleHelp_IsErrorOccur = XTRUE;
ModuleHelp_IsErrorOccur = TRUE;
ModuleHelp_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_HELP_SOCKETTEST_NOTFOUND;
st_LockData.unlock_shared();
return XFALSE;
return FALSE;
}
*pbRun = stl_MapIterator->second->bIsRun;
st_LockData.unlock_shared();
return XTRUE;
return TRUE;
}
/************************************************************************
函数名称：ModuleHelp_SocketTest_DatasStop
......@@ -293,14 +293,14 @@ XBOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_GetDatas(XNETHANDLE xhToken,
************************************************************************/
XBOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_StopDatas(XNETHANDLE xhToken)
{
ModuleHelp_IsErrorOccur = XFALSE;
ModuleHelp_IsErrorOccur = FALSE;
st_LockData.unlock();
unordered_map<XNETHANDLE, MODULEHELP_SOCKETTEST_DATAINFO*>::iterator stl_MapIterator = stl_MapDataTest.find(xhToken);
if (stl_MapIterator != stl_MapDataTest.end())
{
//关闭客户端
stl_MapIterator->second->bIsRun = XFALSE;
stl_MapIterator->second->bIsRun = FALSE;
stl_MapIterator->second->pSTDThread->join();
XClient_TCPSelect_Close(stl_MapIterator->second->hSocket);
......@@ -316,7 +316,7 @@ XBOOL CModuleHelp_SocketTest::ModuleHelp_SocketTest_StopDatas(XNETHANDLE xhToken
stl_MapDataTest.erase(stl_MapIterator);
}
st_LockData.unlock();
return XTRUE;
return TRUE;
}
//////////////////////////////////////////////////////////////////////////
// 线程函数
......@@ -328,7 +328,7 @@ XHTHREAD CModuleHelp_SocketTest::ModuleHelp_SocketTest_ThreadConn(XPVOID lParam)
__int64x nSucess = 0;
__int64x nNumber = 0;
while (XTRUE)
while (TRUE)
{
if ((nNumber >= pSt_ReConnect->st_SocketConn.nConnectTest) && (-1 != pSt_ReConnect->st_SocketConn.nConnectTest))
{
......@@ -355,7 +355,7 @@ XHTHREAD CModuleHelp_SocketTest::ModuleHelp_SocketTest_ThreadConn(XPVOID lParam)
std::this_thread::sleep_for(std::chrono::milliseconds(pSt_ReConnect->st_SocketConn.nCloseWaitContTime));
}
pSt_ReConnect->lpCall_ReConnect(pSt_ReConnect->xhToken, pSt_ReConnect->st_SocketConn.tszAddr, pSt_ReConnect->st_SocketConn.nPort, nNumber, nFailed, nSucess, 2, pSt_ReConnect->lParam);
pSt_ReConnect->bIsRun = XFALSE;
pSt_ReConnect->bIsRun = FALSE;
return 0;
}
XHTHREAD CModuleHelp_SocketTest::ModuleHelp_SocketTest_ThreadData(XPVOID lParam)
......@@ -365,7 +365,7 @@ XHTHREAD CModuleHelp_SocketTest::ModuleHelp_SocketTest_ThreadData(XPVOID lParam)
__int64x nSucess = 0;
__int64x nNumber = 0;
while (XTRUE)
while (TRUE)
{
if ((nNumber >= pSt_DataSocket->st_SocketData.st_REConnect.nConnectTest) && (-1 != pSt_DataSocket->st_SocketData.st_REConnect.nConnectTest))
{
......@@ -376,7 +376,7 @@ XHTHREAD CModuleHelp_SocketTest::ModuleHelp_SocketTest_ThreadData(XPVOID lParam)
break;
}
//发送数据
XBOOL bRet = XFALSE;
XBOOL bRet = FALSE;
if (pSt_DataSocket->bIsTCP)
{
bRet = XClient_TCPSelect_SendMsg(pSt_DataSocket->hSocket, pSt_DataSocket->st_SocketData.tszSDBuffer, pSt_DataSocket->st_SocketData.nSDLen);
......@@ -391,7 +391,7 @@ XHTHREAD CModuleHelp_SocketTest::ModuleHelp_SocketTest_ThreadData(XPVOID lParam)
if (pSt_DataSocket->st_SocketData.nRVLen > 0)
{
//是否需要可读判断
if (XClient_OPTSocket_IOSelect(pSt_DataSocket->hSocket, XTRUE, pSt_DataSocket->st_SocketData.st_REConnect.nContWaitTime))
if (XClient_OPTSocket_IOSelect(pSt_DataSocket->hSocket, TRUE, pSt_DataSocket->st_SocketData.st_REConnect.nContWaitTime))
{
//接受数据
int nMsgLen = pSt_DataSocket->st_SocketData.nRVLen;
......@@ -429,6 +429,6 @@ XHTHREAD CModuleHelp_SocketTest::ModuleHelp_SocketTest_ThreadData(XPVOID lParam)
std::this_thread::sleep_for(std::chrono::milliseconds(pSt_DataSocket->st_SocketData.st_REConnect.nCloseWaitContTime));
}
pSt_DataSocket->lpCall_TestDatas(pSt_DataSocket->xhToken, pSt_DataSocket->st_SocketData.st_REConnect.tszAddr, pSt_DataSocket->st_SocketData.st_REConnect.nPort, nNumber, nFailed, nSucess, 2, pSt_DataSocket->lParam);
pSt_DataSocket->bIsRun = XFALSE;
pSt_DataSocket->bIsRun = FALSE;
return 0;
}
XEngine_Source/XEngine_ModuleHelp/ModuleHelp_SocketTest/ModuleHelp_SocketTest.h
浏览文件 @ ee641df1
......@@ -45,7 +45,7 @@ public:
XBOOL ModuleHelp_SocketTest_GetConnect(XNETHANDLE xhToken, XBOOL* pbRun);
XBOOL ModuleHelp_SocketTest_StopConnect(XNETHANDLE xhToken);
//数据包压力测试
XBOOL ModuleHelp_SocketTest_StartDatas(XNETHANDLE* pxhToken, MODULEHELP_SOCKETTEST_DATAS* pSt_SocketDatas, CALLBACK_APISERVICE_MODULE_HELP_SOCKETTEST fpCall_DataTest, XBOOL bTCP = XTRUE, XPVOID lParam = NULL);
XBOOL ModuleHelp_SocketTest_StartDatas(XNETHANDLE* pxhToken, MODULEHELP_SOCKETTEST_DATAS* pSt_SocketDatas, CALLBACK_APISERVICE_MODULE_HELP_SOCKETTEST fpCall_DataTest, XBOOL bTCP = TRUE, XPVOID lParam = NULL);
XBOOL ModuleHelp_SocketTest_GetDatas(XNETHANDLE xhToken, XBOOL* pbRun);
XBOOL ModuleHelp_SocketTest_StopDatas(XNETHANDLE xhToken);
protected:
......
XEngine_Source/XEngine_ModuleHelp/XEngine_ModuleHelp.vcxproj
浏览文件 @ ee641df1
......@@ -30,27 +30,27 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
......
XEngine_Source/XEngine_ModuleHelp/dllmain.cpp
浏览文件 @ ee641df1
......@@ -14,6 +14,6 @@ XBOOL APIENTRY DllMain( HMODULE hModule,
case DLL_PROCESS_DETACH:
break;
}
return XTRUE;
return TRUE;
}
XEngine_Source/XEngine_ModuleHelp/pch.cpp
浏览文件 @ ee641df1
......@@ -16,7 +16,7 @@
// Purpose: 导出函数实现
// History:
*********************************************************************/
XBOOL ModuleHelp_IsErrorOccur = XFALSE;
XBOOL ModuleHelp_IsErrorOccur = FALSE;
XLONG ModuleHelp_dwErrorCode = 0;
//////////////////////////////////////////////////////////////////////////
CModuleHelp_IDCard m_IDCard;
......
XEngine_Source/XEngine_ModulePlugin/ModulePlugin_LibCore/ModulePlugin_LibCore.cpp
浏览文件 @ ee641df1
......@@ -13,7 +13,7 @@
*********************************************************************/
CModulePlugin_LibCore::CModulePlugin_LibCore()
{
bIsInit = XFALSE;
bIsInit = FALSE;
}
CModulePlugin_LibCore::~CModulePlugin_LibCore()
{
......@@ -31,17 +31,17 @@ CModulePlugin_LibCore::~CModulePlugin_LibCore()
*********************************************************************/
XBOOL CModulePlugin_LibCore::ModulePlugin_LibCore_Init()
{
ModulePlugin_IsErrorOccur = XFALSE;
ModulePlugin_IsErrorOccur = FALSE;
//判断是否初始化
if (bIsInit)
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_ISINITED;
return XFALSE;
return FALSE;
}
//启动线程
bIsInit = XTRUE;
return XTRUE;
bIsInit = TRUE;
return TRUE;
}
/********************************************************************
函数名称：ModulePlugin_LibCore_Push
......@@ -68,19 +68,19 @@ XBOOL CModulePlugin_LibCore::ModulePlugin_LibCore_Init()
*********************************************************************/
XBOOL CModulePlugin_LibCore::ModulePlugin_LibCore_Push(XNETHANDLE* pxhModule, LPCXSTR lpszPluginFile, XPVOID lParam)
{
ModulePlugin_IsErrorOccur = XFALSE;
ModulePlugin_IsErrorOccur = FALSE;
if (!BaseLib_OperatorHandle_Create(pxhModule))
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = BaseLib_GetLastError();
return XFALSE;
return FALSE;
}
if (!ModulePlugin_LibCore_Add(*pxhModule, lpszPluginFile, lParam))
{
return XFALSE;
return FALSE;
}
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModulePlugin_LibCore_Exec
......@@ -132,28 +132,28 @@ XBOOL CModulePlugin_LibCore::ModulePlugin_LibCore_Push(XNETHANDLE* pxhModule, LP
*********************************************************************/
XBOOL CModulePlugin_LibCore::ModulePlugin_LibCore_Exec(XNETHANDLE xhModule, XCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer /* = NULL */, int nMsgLen /* = 0 */)
{
ModulePlugin_IsErrorOccur = XFALSE;
ModulePlugin_IsErrorOccur = FALSE;
st_csStl.lock_shared();
//执行指定插件函数
unordered_map<XNETHANDLE, PLUGINCORE_FRAMEWORK>::const_iterator stl_MapIterator = stl_MapFrameWork.find(xhModule);
if (stl_MapIterator == stl_MapFrameWork.end())
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_NOTFOUND;
st_csStl.unlock_shared();
return XFALSE;
return FALSE;
}
if (!stl_MapIterator->second.fpCall_PluginCore_Call(pppHDRList, nListCount, pInt_HTTPCode, ptszMsgBuffer, pInt_MsgLen, lpszMsgBufer, nMsgLen))
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = stl_MapIterator->second.fpCall_PluginCore_GetLastError();
st_csStl.unlock_shared();
return XFALSE;
return FALSE;
}
st_csStl.unlock_shared();
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModulePlugin_LibCore_Destroy
......@@ -165,14 +165,14 @@ XBOOL CModulePlugin_LibCore::ModulePlugin_LibCore_Exec(XNETHANDLE xhModule, XCHA
*********************************************************************/
XBOOL CModulePlugin_LibCore::ModulePlugin_LibCore_Destroy()
{
ModulePlugin_IsErrorOccur = XFALSE;
ModulePlugin_IsErrorOccur = FALSE;
//判断是否初始化
if (!bIsInit)
{
return XTRUE;
return TRUE;
}
bIsInit = XFALSE;
bIsInit = FALSE;
//清理STL元素空间
st_csStl.lock();
unordered_map<XNETHANDLE, PLUGINCORE_FRAMEWORK>::iterator stl_MapIterator = stl_MapFrameWork.begin();
......@@ -187,7 +187,7 @@ XBOOL CModulePlugin_LibCore::ModulePlugin_LibCore_Destroy()
}
stl_MapFrameWork.clear();
st_csStl.unlock();
return XTRUE;
return TRUE;
}
//////////////////////////////////////////////////////////////////////////
// 保护函数
......@@ -217,34 +217,34 @@ XBOOL CModulePlugin_LibCore::ModulePlugin_LibCore_Destroy()
*********************************************************************/
XBOOL CModulePlugin_LibCore::ModulePlugin_LibCore_Add(XNETHANDLE xhNet, LPCXSTR lpszPluginFile, XPVOID lParam)
{
ModulePlugin_IsErrorOccur = XFALSE;
ModulePlugin_IsErrorOccur = FALSE;
if (NULL == lpszPluginFile)
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_PARAMENT;
return XFALSE;
return FALSE;
}
PLUGINCORE_FRAMEWORK st_FrameWork;
st_FrameWork.mhFile = 0;
memset(st_FrameWork.tszModuleFile, '\0', sizeof(st_FrameWork.tszModuleFile));
//打开一个模块
#ifdef _MSC_BUILD
st_FrameWork.mhFile = LoadLibrary(lpszPluginFile);
st_FrameWork.mhFile = LoadLibraryA(lpszPluginFile);
#else
st_FrameWork.mhFile = dlopen(lpszPluginFile, RTLD_LAZY);
#endif
if (NULL == st_FrameWork.mhFile)
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_OPENDL;
return XFALSE;
return FALSE;
}
//开始查找模块中的函数
#ifdef _MSC_BUILD
st_FrameWork.fpCall_PluginCore_Init = (FPCall_PluginCore_Init)GetProcAddress(st_FrameWork.mhFile, "PluginCore_Init");
#else
* (void**)(&st_FrameWork.fpCall_PluginCore_Init) = dlsym(st_FrameWork.mhFile, _T("PluginCore_Init"));
* (void**)(&st_FrameWork.fpCall_PluginCore_Init) = dlsym(st_FrameWork.mhFile, _X("PluginCore_Init"));
#endif
if (NULL == st_FrameWork.fpCall_PluginCore_Init)
{
......@@ -253,14 +253,14 @@ XBOOL CModulePlugin_LibCore::ModulePlugin_LibCore_Add(XNETHANDLE xhNet, LPCXSTR
#else
dlclose(st_FrameWork.mhFile);
#endif
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_FPINIT;
return XFALSE;
return FALSE;
}
#ifdef _MSC_BUILD
st_FrameWork.fpCall_PluginCore_UnInit = (FPCall_PluginCore_UnInit)GetProcAddress(st_FrameWork.mhFile, "PluginCore_UnInit");
#else
* (void**)(&st_FrameWork.fpCall_PluginCore_UnInit) = dlsym(st_FrameWork.mhFile, _T("PluginCore_UnInit"));
* (void**)(&st_FrameWork.fpCall_PluginCore_UnInit) = dlsym(st_FrameWork.mhFile, _X("PluginCore_UnInit"));
#endif
if (NULL == st_FrameWork.fpCall_PluginCore_UnInit)
{
......@@ -269,14 +269,14 @@ XBOOL CModulePlugin_LibCore::ModulePlugin_LibCore_Add(XNETHANDLE xhNet, LPCXSTR
#else
dlclose(st_FrameWork.mhFile);
#endif
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_FPUNINIT;
return XFALSE;
return FALSE;
}
#ifdef _MSC_BUILD
st_FrameWork.fpCall_PluginCore_Call = (FPCall_PluginCore_Call)GetProcAddress(st_FrameWork.mhFile, "PluginCore_Call");
#else
* (void**)(&st_FrameWork.fpCall_PluginCore_Call) = dlsym(st_FrameWork.mhFile, _T("PluginCore_Call"));
* (void**)(&st_FrameWork.fpCall_PluginCore_Call) = dlsym(st_FrameWork.mhFile, _X("PluginCore_Call"));
#endif
if (NULL == st_FrameWork.fpCall_PluginCore_Call)
{
......@@ -285,14 +285,14 @@ XBOOL CModulePlugin_LibCore::ModulePlugin_LibCore_Add(XNETHANDLE xhNet, LPCXSTR
#else
dlclose(st_FrameWork.mhFile);
#endif
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_FPCALL;
return XFALSE;
return FALSE;
}
#ifdef _MSC_BUILD
st_FrameWork.fpCall_PluginCore_GetLastError = (FPCall_PluginCore_GetLastError)GetProcAddress(st_FrameWork.mhFile, _T("PluginCore_GetLastError"));
st_FrameWork.fpCall_PluginCore_GetLastError = (FPCall_PluginCore_GetLastError)GetProcAddress(st_FrameWork.mhFile, _X("PluginCore_GetLastError"));
#else
* (void**)(&st_FrameWork.fpCall_PluginCore_GetLastError) = dlsym(st_FrameWork.mhFile, _T("PluginCore_GetLastError"));
* (void**)(&st_FrameWork.fpCall_PluginCore_GetLastError) = dlsym(st_FrameWork.mhFile, _X("PluginCore_GetLastError"));
#endif
if (NULL == st_FrameWork.fpCall_PluginCore_GetLastError)
{
......@@ -301,9 +301,9 @@ XBOOL CModulePlugin_LibCore::ModulePlugin_LibCore_Add(XNETHANDLE xhNet, LPCXSTR
#else
dlclose(st_FrameWork.mhFile);
#endif
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_FPERROR;
return XFALSE;
return FALSE;
}
//初始化内部模块
if (!st_FrameWork.fpCall_PluginCore_Init(lParam))
......@@ -313,15 +313,15 @@ XBOOL CModulePlugin_LibCore::ModulePlugin_LibCore_Add(XNETHANDLE xhNet, LPCXSTR
#else
dlclose(st_FrameWork.mhFile);
#endif
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_INIT;
return XFALSE;
return FALSE;
}
_tcscpy(st_FrameWork.tszModuleFile, lpszPluginFile);
_tcsxcpy(st_FrameWork.tszModuleFile, lpszPluginFile);
//添加模块属性到STL函数中
st_csStl.lock();
stl_MapFrameWork.insert(make_pair(xhNet, st_FrameWork));
st_csStl.unlock();
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_ModulePlugin/ModulePlugin_Loader/ModulePlugin_Loader.cpp
浏览文件 @ ee641df1
......@@ -45,40 +45,40 @@ CModulePlugin_Loader::~CModulePlugin_Loader()
*********************************************************************/
XBOOL CModulePlugin_Loader::ModulePlugin_Loader_Insert(LPCXSTR lpszModuleMethod, LPCXSTR lpszModuleName, int nType /* = 0 */)
{
ModulePlugin_IsErrorOccur = XFALSE;
ModulePlugin_IsErrorOccur = FALSE;
if ((NULL == lpszModuleMethod) || (NULL == lpszModuleName))
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_PARAMENT;
return XFALSE;
return FALSE;
}
PLUGINCORE_LOADER st_PluginLoader;
memset(&st_PluginLoader, '\0', sizeof(PLUGINCORE_LOADER));
st_PluginLoader.nType = nType;
_tcscpy(st_PluginLoader.tszModuleFile, lpszModuleName);
_tcscpy(st_PluginLoader.tszModuleMethod, lpszModuleMethod);
_tcsxcpy(st_PluginLoader.tszModuleFile, lpszModuleName);
_tcsxcpy(st_PluginLoader.tszModuleMethod, lpszModuleMethod);
if (0 == nType)
{
if (!ModulePlugin_LibCore_Push(&st_PluginLoader.xhToken, lpszModuleName))
{
return XFALSE;
return FALSE;
}
}
else
{
if (!ModulePlugin_LuaCore_Push(&st_PluginLoader.xhToken, lpszModuleName))
{
return XFALSE;
return FALSE;
}
}
st_Locker.lock();
stl_MapLoader.insert(make_pair(lpszModuleMethod, st_PluginLoader));
st_Locker.unlock();
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModulePlugin_Loader_Find
......@@ -100,29 +100,29 @@ XBOOL CModulePlugin_Loader::ModulePlugin_Loader_Insert(LPCXSTR lpszModuleMethod,
*********************************************************************/
XBOOL CModulePlugin_Loader::ModulePlugin_Loader_Find(LPCXSTR lpszMethodName, int* pInt_Type)
{
ModulePlugin_IsErrorOccur = XFALSE;
ModulePlugin_IsErrorOccur = FALSE;
if (NULL == lpszMethodName)
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_PARAMENT;
return XFALSE;
return FALSE;
}
st_Locker.lock_shared();
unordered_map<string, PLUGINCORE_LOADER>::const_iterator stl_MapIterator = stl_MapLoader.find(lpszMethodName);
if (stl_MapIterator == stl_MapLoader.end())
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_NOTFOUND;
st_Locker.unlock_shared();
return XFALSE;
return FALSE;
}
if (NULL != pInt_Type)
{
*pInt_Type = stl_MapIterator->second.nType;
}
st_Locker.unlock_shared();
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModulePlugin_Loader_Exec
......@@ -164,22 +164,22 @@ XBOOL CModulePlugin_Loader::ModulePlugin_Loader_Find(LPCXSTR lpszMethodName, int
*********************************************************************/
XBOOL CModulePlugin_Loader::ModulePlugin_Loader_Exec(LPCXSTR lpszMethodName, XCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR* ptszMsgBuffer, int* pInt_MsgLen)
{
ModulePlugin_IsErrorOccur = XFALSE;
ModulePlugin_IsErrorOccur = FALSE;
if (NULL == lpszMethodName)
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_PARAMENT;
return XFALSE;
return FALSE;
}
st_Locker.lock_shared();
unordered_map<string, PLUGINCORE_LOADER>::const_iterator stl_MapIterator = stl_MapLoader.find(lpszMethodName);
if (stl_MapIterator == stl_MapLoader.end())
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_NOTFOUND;
st_Locker.unlock_shared();
return XFALSE;
return FALSE;
}
if (0 == stl_MapIterator->second.nType)
......@@ -187,7 +187,7 @@ XBOOL CModulePlugin_Loader::ModulePlugin_Loader_Exec(LPCXSTR lpszMethodName, XCH
if (!ModulePlugin_LibCore_Exec(stl_MapIterator->second.xhToken, pppHDRList, nListCount, pInt_HTTPCode, ptszMsgBuffer, pInt_MsgLen))
{
st_Locker.unlock_shared();
return XFALSE;
return FALSE;
}
}
else
......@@ -195,11 +195,11 @@ XBOOL CModulePlugin_Loader::ModulePlugin_Loader_Exec(LPCXSTR lpszMethodName, XCH
if (!ModulePlugin_LuaCore_Exec(stl_MapIterator->second.xhToken, pppHDRList, nListCount, pInt_HTTPCode, ptszMsgBuffer, pInt_MsgLen))
{
st_Locker.unlock_shared();
return XFALSE;
return FALSE;
}
}
st_Locker.unlock_shared();
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModulePlugin_Loader_Destory
......@@ -211,10 +211,10 @@ XBOOL CModulePlugin_Loader::ModulePlugin_Loader_Exec(LPCXSTR lpszMethodName, XCH
*********************************************************************/
XBOOL CModulePlugin_Loader::ModulePlugin_Loader_Destory()
{
ModulePlugin_IsErrorOccur = XFALSE;
ModulePlugin_IsErrorOccur = FALSE;
st_Locker.lock();
stl_MapLoader.clear();
st_Locker.unlock_shared();
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_ModulePlugin/ModulePlugin_LuaCore/ModulePlugin_LuaCore.cpp
浏览文件 @ ee641df1
......@@ -13,7 +13,7 @@
*********************************************************************/
CModulePlugin_LuaCore::CModulePlugin_LuaCore()
{
bIsInit = XFALSE;
bIsInit = FALSE;
}
CModulePlugin_LuaCore::~CModulePlugin_LuaCore()
{
......@@ -31,17 +31,17 @@ CModulePlugin_LuaCore::~CModulePlugin_LuaCore()
*********************************************************************/
XBOOL CModulePlugin_LuaCore::ModulePlugin_LuaCore_Init()
{
ModulePlugin_IsErrorOccur = XFALSE;
ModulePlugin_IsErrorOccur = FALSE;
//判断是否初始化
if (bIsInit)
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_ISINITED;
return XFALSE;
return FALSE;
}
//启动线程
bIsInit = XTRUE;
return XTRUE;
bIsInit = TRUE;
return TRUE;
}
/********************************************************************
函数名称：ModulePlugin_LuaCore_Push
......@@ -68,19 +68,19 @@ XBOOL CModulePlugin_LuaCore::ModulePlugin_LuaCore_Init()
*********************************************************************/
XBOOL CModulePlugin_LuaCore::ModulePlugin_LuaCore_Push(XNETHANDLE* pxhModule, LPCXSTR lpszPluginFile, XPVOID lParam)
{
ModulePlugin_IsErrorOccur = XFALSE;
ModulePlugin_IsErrorOccur = FALSE;
if (!BaseLib_OperatorHandle_Create(pxhModule))
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = BaseLib_GetLastError();
return XFALSE;
return FALSE;
}
if (!ModulePlugin_LuaCore_Add(*pxhModule, lpszPluginFile, lParam))
{
return XFALSE;
return FALSE;
}
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModulePlugin_LuaCore_Exec
......@@ -132,24 +132,24 @@ XBOOL CModulePlugin_LuaCore::ModulePlugin_LuaCore_Push(XNETHANDLE* pxhModule, LP
*********************************************************************/
XBOOL CModulePlugin_LuaCore::ModulePlugin_LuaCore_Exec(XNETHANDLE xhModule, XCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBufer /* = NULL */, int nMsgLen /* = 0 */)
{
ModulePlugin_IsErrorOccur = XFALSE;
ModulePlugin_IsErrorOccur = FALSE;
st_csStl.lock_shared();
//执行指定插件函数
unordered_map<XNETHANDLE, PLUGINCORE_LUAFRAMEWORK>::const_iterator stl_MapIterator = stl_MapFrameWork.find(xhModule);
if (stl_MapIterator == stl_MapFrameWork.end())
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_NOTFOUND;
st_csStl.unlock_shared();
return XFALSE;
return FALSE;
}
if (0 == lua_getglobal(stl_MapIterator->second.pSt_LuaState, "PluginCore_Call"))
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_FPCALL;
st_csStl.unlock_shared();
return XFALSE;
return FALSE;
}
XCHAR tszURLParam[MAX_PATH];
memset(tszURLParam, '\0', MAX_PATH);
......@@ -158,9 +158,9 @@ XBOOL CModulePlugin_LuaCore::ModulePlugin_LuaCore_Exec(XNETHANDLE xhModule, XCHA
{
if (i > 1)
{
_tcscat(tszURLParam, "&");
_tcsxcat(tszURLParam, "&");
}
_tcscat(tszURLParam, (*pppHDRList)[i]);
_tcsxcat(tszURLParam, (*pppHDRList)[i]);
}
lua_pushstring(stl_MapIterator->second.pSt_LuaState, tszURLParam);
lua_pushinteger(stl_MapIterator->second.pSt_LuaState, nListCount - 1);
......@@ -168,17 +168,17 @@ XBOOL CModulePlugin_LuaCore::ModulePlugin_LuaCore_Exec(XNETHANDLE xhModule, XCHA
lua_pushinteger(stl_MapIterator->second.pSt_LuaState, nMsgLen);
if (LUA_OK != lua_pcall(stl_MapIterator->second.pSt_LuaState, 4, 1, 0))
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_EXECTION;
st_csStl.unlock_shared();
return XFALSE;
return FALSE;
}
lua_getglobal(stl_MapIterator->second.pSt_LuaState, "PInt_HTTPCode");
*pInt_HTTPCode = (int)lua_tonumber(stl_MapIterator->second.pSt_LuaState, -1);
lua_pop(stl_MapIterator->second.pSt_LuaState, -1);
lua_getglobal(stl_MapIterator->second.pSt_LuaState, "PtszMsgBuffer");
_tcscpy(ptszMsgBuffer, lua_tostring(stl_MapIterator->second.pSt_LuaState, -1));
_tcsxcpy(ptszMsgBuffer, lua_tostring(stl_MapIterator->second.pSt_LuaState, -1));
lua_pop(stl_MapIterator->second.pSt_LuaState, -1);
lua_getglobal(stl_MapIterator->second.pSt_LuaState, "PInt_MsgLen");
......@@ -187,7 +187,7 @@ XBOOL CModulePlugin_LuaCore::ModulePlugin_LuaCore_Exec(XNETHANDLE xhModule, XCHA
st_csStl.unlock_shared();
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModulePlugin_LuaCore_Destroy
......@@ -199,14 +199,14 @@ XBOOL CModulePlugin_LuaCore::ModulePlugin_LuaCore_Exec(XNETHANDLE xhModule, XCHA
*********************************************************************/
XBOOL CModulePlugin_LuaCore::ModulePlugin_LuaCore_Destroy()
{
ModulePlugin_IsErrorOccur = XFALSE;
ModulePlugin_IsErrorOccur = FALSE;
//判断是否初始化
if (!bIsInit)
{
return XTRUE;
return TRUE;
}
bIsInit = XFALSE;
bIsInit = FALSE;
//清理STL元素空间
st_csStl.lock();
unordered_map<XNETHANDLE, PLUGINCORE_LUAFRAMEWORK>::iterator stl_MapIterator = stl_MapFrameWork.begin();
......@@ -220,7 +220,7 @@ XBOOL CModulePlugin_LuaCore::ModulePlugin_LuaCore_Destroy()
stl_MapFrameWork.clear();
st_csStl.unlock();
return XTRUE;
return TRUE;
}
//////////////////////////////////////////////////////////////////////////
// 保护函数
......@@ -250,64 +250,64 @@ XBOOL CModulePlugin_LuaCore::ModulePlugin_LuaCore_Destroy()
*********************************************************************/
XBOOL CModulePlugin_LuaCore::ModulePlugin_LuaCore_Add(XNETHANDLE xhNet, LPCXSTR lpszPluginFile, XPVOID lParam)
{
ModulePlugin_IsErrorOccur = XFALSE;
ModulePlugin_IsErrorOccur = FALSE;
if (NULL == lpszPluginFile)
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_PARAMENT;
return XFALSE;
return FALSE;
}
PLUGINCORE_LUAFRAMEWORK st_LuaCore;
memset(&st_LuaCore, '\0', sizeof(PLUGINCORE_LUAFRAMEWORK));
st_LuaCore.pSt_LuaState = luaL_newstate();
_tcscpy(st_LuaCore.tszModuleFile, lpszPluginFile);
_tcsxcpy(st_LuaCore.tszModuleFile, lpszPluginFile);
if (NULL == st_LuaCore.pSt_LuaState)
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_MALLOC;
return XFALSE;
return FALSE;
}
luaL_openlibs(st_LuaCore.pSt_LuaState);
if (LUA_OK != luaL_loadfile(st_LuaCore.pSt_LuaState, lpszPluginFile))
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_OPENDL;
return XFALSE;
return FALSE;
}
if (LUA_OK != lua_pcall(st_LuaCore.pSt_LuaState, 0, 0, 0))
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_EXECTION;
return XFALSE;
return FALSE;
}
if (0 == lua_getglobal(st_LuaCore.pSt_LuaState, "PluginCore_Init"))
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_FPINIT;
return XFALSE;
return FALSE;
}
if (LUA_OK != lua_pcall(st_LuaCore.pSt_LuaState, 0, 1, 0))
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_EXECTION;
return XFALSE;
return FALSE;
}
if (!lua_toboolean(st_LuaCore.pSt_LuaState, -1))
{
ModulePlugin_IsErrorOccur = XTRUE;
ModulePlugin_IsErrorOccur = TRUE;
ModulePlugin_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PLUGIN_EXECTION;
return XFALSE;
return FALSE;
}
lua_pop(st_LuaCore.pSt_LuaState, -1);
st_csStl.lock();
stl_MapFrameWork.insert(make_pair(xhNet, st_LuaCore));
st_csStl.unlock();
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_ModulePlugin/XEngine_ModulePlugin.vcxproj
浏览文件 @ ee641df1
......@@ -30,27 +30,27 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
......
XEngine_Source/XEngine_ModulePlugin/dllmain.cpp
浏览文件 @ ee641df1
......@@ -14,6 +14,6 @@ XBOOL APIENTRY DllMain( HMODULE hModule,
case DLL_PROCESS_DETACH:
break;
}
return XTRUE;
return TRUE;
}
XEngine_Source/XEngine_ModulePlugin/pch.cpp
浏览文件 @ ee641df1
......@@ -13,7 +13,7 @@
// Purpose: 插件核心导出函数实现
// History:
*********************************************************************/
XBOOL ModulePlugin_IsErrorOccur = XFALSE;
XBOOL ModulePlugin_IsErrorOccur = FALSE;
XLONG ModulePlugin_dwErrorCode = 0;
//////////////////////////////////////////////////////////////////////////
CModulePlugin_LibCore m_PluginLib;
......
XEngine_Source/XEngine_ModuleProtocol/ModuleProtocol_Packet/ModuleProtocol_Packet.cpp
浏览文件 @ ee641df1
......@@ -51,13 +51,13 @@ CModuleProtocol_Packet::~CModuleProtocol_Packet()
*********************************************************************/
XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_Common(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nCode /* = 0 */, LPCXSTR lpszMsgBuffer /* = NULL */)
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
if ((NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
{
ModuleProtocol_IsErrorOccur = XTRUE;
ModuleProtocol_IsErrorOccur = TRUE;
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PACKET_PARAMENT;
return XFALSE;
return FALSE;
}
Json::Value st_JsonRoot;
......@@ -68,7 +68,7 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_Common(XCHAR* ptszMsgBuffer,
}
*pInt_MsgLen = st_JsonRoot.toStyledString().length();
memcpy(ptszMsgBuffer, st_JsonRoot.toStyledString().c_str(), *pInt_MsgLen);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleProtocol_Packet_IDQuery
......@@ -110,13 +110,13 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_Common(XCHAR* ptszMsgBuffer,
*********************************************************************/
XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_IDQuery(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_IDCARDINFO* pSt_IDInfo, XENGINE_IDREGION* pSt_IDRegion, int nCode /* = 0 */, LPCXSTR lpszMsgBuffer /* = NULL */)
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
if ((NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
{
ModuleProtocol_IsErrorOccur = XTRUE;
ModuleProtocol_IsErrorOccur = TRUE;
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PACKET_PARAMENT;
return XFALSE;
return FALSE;
}
Json::Value st_JsonRoot;
Json::Value st_JsonObject;
......@@ -133,19 +133,19 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_IDQuery(XCHAR* ptszMsgBuffer
st_JsonObject["nCheck"] = pSt_IDInfo->nCheck;
#ifdef _MSC_BUILD
int nUTFLen = _tcslen(pSt_IDRegion->tszProvincer);
int nUTFLen = _tcsxlen(pSt_IDRegion->tszProvincer);
XCHAR tszUTFBuffer[MAX_PATH];
memset(tszUTFBuffer, '\0', MAX_PATH);
BaseLib_OperatorCharset_AnsiToUTF(pSt_IDRegion->tszProvincer, tszUTFBuffer, &nUTFLen);
st_JsonObject["tszProvincer"] = tszUTFBuffer;
nUTFLen = _tcslen(pSt_IDRegion->tszCity);
nUTFLen = _tcsxlen(pSt_IDRegion->tszCity);
memset(tszUTFBuffer, '\0', MAX_PATH);
BaseLib_OperatorCharset_AnsiToUTF(pSt_IDRegion->tszCity, tszUTFBuffer, &nUTFLen);
st_JsonObject["tszCity"] = tszUTFBuffer;
nUTFLen = _tcslen(pSt_IDRegion->tszCounty);
nUTFLen = _tcsxlen(pSt_IDRegion->tszCounty);
memset(tszUTFBuffer, '\0', MAX_PATH);
BaseLib_OperatorCharset_AnsiToUTF(pSt_IDRegion->tszCounty, tszUTFBuffer, &nUTFLen);
st_JsonObject["tszCounty"] = tszUTFBuffer;
......@@ -170,7 +170,7 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_IDQuery(XCHAR* ptszMsgBuffer
*pInt_MsgLen = Json::writeString(st_JsonBuilder, st_JsonRoot).length();
memcpy(ptszMsgBuffer, Json::writeString(st_JsonBuilder, st_JsonRoot).c_str(), *pInt_MsgLen);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleProtocol_Packet_BankQuery
......@@ -207,13 +207,13 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_IDQuery(XCHAR* ptszMsgBuffer
*********************************************************************/
XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_BankQuery(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_BANKINFO* pSt_BankInfo, int nCode /* = 0 */, LPCXSTR lpszMsgBuffer /* = NULL */)
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
if ((NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
{
ModuleProtocol_IsErrorOccur = XTRUE;
ModuleProtocol_IsErrorOccur = TRUE;
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PACKET_PARAMENT;
return XFALSE;
return FALSE;
}
Json::Value st_JsonRoot;
Json::Value st_JsonObject;
......@@ -229,7 +229,7 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_BankQuery(XCHAR* ptszMsgBuff
XCHAR tszUTFBuffer[MAX_PATH];
memset(tszUTFBuffer, '\0', MAX_PATH);
int nUTFLen = _tcslen(pSt_BankInfo->tszBankName);
int nUTFLen = _tcsxlen(pSt_BankInfo->tszBankName);
BaseLib_OperatorCharset_AnsiToUTF(pSt_BankInfo->tszBankName, tszUTFBuffer, &nUTFLen);
st_JsonObject["tszBankName"] = tszUTFBuffer;
#else
......@@ -251,7 +251,7 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_BankQuery(XCHAR* ptszMsgBuff
*pInt_MsgLen = Json::writeString(st_JsonBuilder, st_JsonRoot).length();
memcpy(ptszMsgBuffer, Json::writeString(st_JsonBuilder, st_JsonRoot).c_str(), *pInt_MsgLen);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleProtocol_Packet_LanguageQuery
......@@ -288,13 +288,13 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_BankQuery(XCHAR* ptszMsgBuff
*********************************************************************/
XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_LanguageQuery(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_LANGUAGEINFO* pSt_LanguageInfo, int nCode /* = 0 */, LPCXSTR lpszMsgBuffer /* = NULL */)
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
if ((NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
{
ModuleProtocol_IsErrorOccur = XTRUE;
ModuleProtocol_IsErrorOccur = TRUE;
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PACKET_PARAMENT;
return XFALSE;
return FALSE;
}
Json::Value st_JsonRoot;
Json::Value st_JsonObject;
......@@ -321,7 +321,7 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_LanguageQuery(XCHAR* ptszMsg
*pInt_MsgLen = Json::writeString(st_JsonBuilder, st_JsonRoot).length();
memcpy(ptszMsgBuffer, Json::writeString(st_JsonBuilder, st_JsonRoot).c_str(), *pInt_MsgLen);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleProtocol_Packet_Locker
......@@ -358,13 +358,13 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_LanguageQuery(XCHAR* ptszMsg
*********************************************************************/
XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_Locker(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XNETHANDLE xhToken, int nCode, LPCXSTR lpszMsgBuffer)
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
if ((NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
{
ModuleProtocol_IsErrorOccur = XTRUE;
ModuleProtocol_IsErrorOccur = TRUE;
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PACKET_PARAMENT;
return XFALSE;
return FALSE;
}
Json::Value st_JsonRoot;
Json::Value st_JsonObject;
......@@ -386,7 +386,7 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_Locker(XCHAR* ptszMsgBuffer,
*pInt_MsgLen = Json::writeString(st_JsonBuilder, st_JsonRoot).length();
memcpy(ptszMsgBuffer, Json::writeString(st_JsonBuilder, st_JsonRoot).c_str(), *pInt_MsgLen);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleProtocol_Packet_ZIPCode
......@@ -423,13 +423,13 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_Locker(XCHAR* ptszMsgBuffer,
*********************************************************************/
XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_ZIPCode(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_ZIPINFO* pSt_ZIPInfo, int nCode /* = 0 */, LPCXSTR lpszMsgBuffer /* = NULL */)
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
if ((NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
{
ModuleProtocol_IsErrorOccur = XTRUE;
ModuleProtocol_IsErrorOccur = TRUE;
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PACKET_PARAMENT;
return XFALSE;
return FALSE;
}
Json::Value st_JsonRoot;
Json::Value st_JsonObject;
......@@ -462,7 +462,7 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_ZIPCode(XCHAR* ptszMsgBuffer
*pInt_MsgLen = Json::writeString(st_JsonBuilder, st_JsonRoot).length();
memcpy(ptszMsgBuffer, Json::writeString(st_JsonBuilder, st_JsonRoot).c_str(), *pInt_MsgLen);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleProtocol_Packet_Log
......@@ -494,13 +494,13 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_ZIPCode(XCHAR* ptszMsgBuffer
*********************************************************************/
XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_Log(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_XLOGINFO*** pppSt_XLogList, int nListCount)
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
if ((NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
{
ModuleProtocol_IsErrorOccur = XTRUE;
ModuleProtocol_IsErrorOccur = TRUE;
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PACKET_PARAMENT;
return XFALSE;
return FALSE;
}
Json::Value st_JsonRoot;
Json::Value st_JsonArray;
......@@ -528,7 +528,7 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_Log(XCHAR* ptszMsgBuffer, in
*pInt_MsgLen = Json::writeString(st_JsonBuilder, st_JsonRoot).length();
memcpy(ptszMsgBuffer, Json::writeString(st_JsonBuilder, st_JsonRoot).c_str(), *pInt_MsgLen);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleProtocol_Packet_TestReport
......@@ -584,13 +584,13 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_Log(XCHAR* ptszMsgBuffer, in
*********************************************************************/
XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_TestReport(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XNETHANDLE xhToken, LPCXSTR lpszIPAddr, int nIPPort, __int64x nNumber, __int64x nFailed, __int64x nSuccess, int nStatus)
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
if ((NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
{
ModuleProtocol_IsErrorOccur = XTRUE;
ModuleProtocol_IsErrorOccur = TRUE;
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PACKET_PARAMENT;
return XFALSE;
return FALSE;
}
Json::Value st_JsonRoot;
Json::Value st_JsonObject;
......@@ -611,7 +611,7 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_TestReport(XCHAR* ptszMsgBuf
*pInt_MsgLen = Json::writeString(st_JsonBuilder, st_JsonRoot).length();
memcpy(ptszMsgBuffer, Json::writeString(st_JsonBuilder, st_JsonRoot).c_str(), *pInt_MsgLen);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleProtocol_Packet_TestReply
......@@ -638,13 +638,13 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_TestReport(XCHAR* ptszMsgBuf
*********************************************************************/
XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_TestReply(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XNETHANDLE xhToken)
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
if ((NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
{
ModuleProtocol_IsErrorOccur = XTRUE;
ModuleProtocol_IsErrorOccur = TRUE;
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PACKET_PARAMENT;
return XFALSE;
return FALSE;
}
Json::Value st_JsonRoot;
Json::Value st_JsonObject;
......@@ -659,7 +659,7 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_TestReply(XCHAR* ptszMsgBuff
*pInt_MsgLen = Json::writeString(st_JsonBuilder, st_JsonRoot).length();
memcpy(ptszMsgBuffer, Json::writeString(st_JsonBuilder, st_JsonRoot).c_str(), *pInt_MsgLen);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleProtocol_Packet_ShortLink
......@@ -686,13 +686,13 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_TestReply(XCHAR* ptszMsgBuff
*********************************************************************/
XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_ShortLink(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_SHORTLINK* pSt_ShortLink)
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
if ((NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
{
ModuleProtocol_IsErrorOccur = XTRUE;
ModuleProtocol_IsErrorOccur = TRUE;
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PACKET_PARAMENT;
return XFALSE;
return FALSE;
}
Json::Value st_JsonRoot;
Json::Value st_JsonObject;
......@@ -712,7 +712,7 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_ShortLink(XCHAR* ptszMsgBuff
*pInt_MsgLen = Json::writeString(st_JsonBuilder, st_JsonRoot).length();
memcpy(ptszMsgBuffer, Json::writeString(st_JsonBuilder, st_JsonRoot).c_str(), *pInt_MsgLen);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleProtocol_Packet_P2PLan
......@@ -744,13 +744,13 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_ShortLink(XCHAR* ptszMsgBuff
*********************************************************************/
XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_P2PLan(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_P2XPPEER_PROTOCOL*** pppSt_ListClients, int nListCount)
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
if ((NULL == pppSt_ListClients) || (NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PACKET_PARAMENT;
return XFALSE;
return FALSE;
}
Json::Value st_JsonRoot;
Json::Value st_JsonArray;
......@@ -768,7 +768,7 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_P2PLan(XCHAR* ptszMsgBuffer,
*pInt_MsgLen = st_JsonRoot.toStyledString().length();
memcpy(ptszMsgBuffer, st_JsonRoot.toStyledString().c_str(), *pInt_MsgLen);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleProtocol_Packet_P2PWLan
......@@ -795,13 +795,13 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_P2PLan(XCHAR* ptszMsgBuffer,
*********************************************************************/
XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_P2PWLan(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, list<XENGINE_P2XPPEER_PROTOCOL>* pStl_ListClients)
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
if ((NULL == pStl_ListClients) || (NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PACKET_PARAMENT;
return XFALSE;
return FALSE;
}
unordered_map<string, list<P2XPPROTOCOL_LANPACKET>> stl_MapClient;
//首先处理公网下的局域网网段列表
......@@ -816,10 +816,10 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_P2PWLan(XCHAR* ptszMsgBuffer
memset(&st_LANPacket, '\0', sizeof(P2XPPROTOCOL_LANPACKET));
//分割
BaseLib_OperatorIPAddr_IsIPV4Addr(stl_ListIterator->tszPrivateAddr, &st_LibAddr);
_stprintf(tszClientAddr, _T("%d.%d.%d"), st_LibAddr.nIPAddr1, st_LibAddr.nIPAddr2, st_LibAddr.nIPAddr3);
_xstprintf(tszClientAddr, _X("%d.%d.%d"), st_LibAddr.nIPAddr1, st_LibAddr.nIPAddr2, st_LibAddr.nIPAddr3);
//赋值
_tcscpy(st_LANPacket.tszUsername, stl_ListIterator->tszUserName);
_tcscpy(st_LANPacket.tszClientAddr, stl_ListIterator->tszPrivateAddr);
_tcsxcpy(st_LANPacket.tszUsername, stl_ListIterator->tszUserName);
_tcsxcpy(st_LANPacket.tszClientAddr, stl_ListIterator->tszPrivateAddr);
//判断是否存在
unordered_map<string, list<P2XPPROTOCOL_LANPACKET>>::iterator stl_MapIterator = stl_MapClient.find(tszClientAddr);
if (stl_MapIterator == stl_MapClient.end())
......@@ -861,7 +861,7 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_P2PWLan(XCHAR* ptszMsgBuffer
*pInt_MsgLen = st_JsonRoot.toStyledString().length();
memcpy(ptszMsgBuffer, st_JsonRoot.toStyledString().c_str(), *pInt_MsgLen);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleProtocol_Packet_P2PUser
......@@ -888,13 +888,13 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_P2PWLan(XCHAR* ptszMsgBuffer
*********************************************************************/
XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_P2PUser(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_P2XPPEER_PROTOCOL* pSt_PeerInfo)
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
if ((NULL == pSt_PeerInfo) || (NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PACKET_PARAMENT;
return XFALSE;
return FALSE;
}
Json::Value st_JsonRoot;
Json::Value st_JsonAddr;
......@@ -912,7 +912,7 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_P2PUser(XCHAR* ptszMsgBuffer
st_JsonBuilder["emitUTF8"] = true;
*pInt_MsgLen = Json::writeString(st_JsonBuilder, st_JsonRoot).length();
memcpy(ptszMsgBuffer, Json::writeString(st_JsonBuilder, st_JsonRoot).c_str(), *pInt_MsgLen);
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：ModuleProtocol_Packet_P2PConnect
......@@ -944,13 +944,13 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_P2PUser(XCHAR* ptszMsgBuffer
*********************************************************************/
XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_P2PConnect(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_P2XPIO_PROTOCOL* pSt_IOProtocol)
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
if ((NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
{
ModuleProtocol_IsErrorOccur = XFALSE;
ModuleProtocol_IsErrorOccur = FALSE;
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PACKET_PARAMENT;
return XFALSE;
return FALSE;
}
Json::Value st_JsonRoot;
......@@ -962,5 +962,5 @@ XBOOL CModuleProtocol_Packet::ModuleProtocol_Packet_P2PConnect(XCHAR* ptszMsgBuf
*pInt_MsgLen = st_JsonRoot.toStyledString().length();
memcpy(ptszMsgBuffer, st_JsonRoot.toStyledString().c_str(), *pInt_MsgLen);
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_ModuleProtocol/XEngine_ModuleProtocol.vcxproj
浏览文件 @ ee641df1
......@@ -30,27 +30,27 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
......
XEngine_Source/XEngine_ModuleProtocol/dllmain.cpp
浏览文件 @ ee641df1
......@@ -14,6 +14,6 @@ XBOOL APIENTRY DllMain( HMODULE hModule,
case DLL_PROCESS_DETACH:
break;
}
return XTRUE;
return TRUE;
}
XEngine_Source/XEngine_ModuleProtocol/pch.cpp
浏览文件 @ ee641df1
......@@ -12,7 +12,7 @@
// Purpose: 导出协议模块实现
// History:
*********************************************************************/
XBOOL ModuleProtocol_IsErrorOccur = XFALSE;
XBOOL ModuleProtocol_IsErrorOccur = FALSE;
XLONG ModuleProtocol_dwErrorCode = 0;
//////////////////////////////////////////////////////////////////////////
CModuleProtocol_Packet m_ProtocolPacket;
......
XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/ModulePlugin_BMIndex.vcxproj
浏览文件 @ ee641df1
......@@ -31,27 +31,27 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
......
XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/Plugin_BMIndex/Plugin_BMIndex.cpp
浏览文件 @ ee641df1
......@@ -35,9 +35,9 @@ CPlugin_BMIndex::~CPlugin_BMIndex()
*********************************************************************/
XBOOL CPlugin_BMIndex::PluginCore_Init(XPVOID lParam)
{
BMIndex_IsErrorOccur = XFALSE;
BMIndex_IsErrorOccur = FALSE;
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：PluginCore_UnInit
......@@ -49,7 +49,7 @@ XBOOL CPlugin_BMIndex::PluginCore_Init(XPVOID lParam)
*********************************************************************/
void CPlugin_BMIndex::PluginCore_UnInit()
{
BMIndex_IsErrorOccur = XFALSE;
BMIndex_IsErrorOccur = FALSE;
}
/********************************************************************
函数名称：PluginCore_Call
......@@ -61,13 +61,13 @@ void CPlugin_BMIndex::PluginCore_UnInit()
*********************************************************************/
XBOOL CPlugin_BMIndex::PluginCore_Call(XCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBuffer, int nMsgLen)
{
BMIndex_IsErrorOccur = XFALSE;
BMIndex_IsErrorOccur = FALSE;
if ((NULL == pInt_HTTPCode) || (NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
{
BMIndex_IsErrorOccur = XTRUE;
BMIndex_IsErrorOccur = TRUE;
BMIndex_dwErrorCode = ERROR_XENGINE_APISERVICE_PLUGIN_MODULE_BMINDEX_PARAMENT;
return XFALSE;
return FALSE;
}
XCHAR tszKeyName[128];
XCHAR tszParamHigh[128];
......@@ -82,21 +82,21 @@ XBOOL CPlugin_BMIndex::PluginCore_Call(XCHAR*** pppHDRList, int nListCount, int*
Plugin_Timezone_BMIndex(tszParamHigh, tszParamWeight, ptszMsgBuffer, pInt_MsgLen);
*pInt_HTTPCode = 200;
return XTRUE;
return TRUE;
}
//////////////////////////////////////////////////////////////////////////
// 保护函数
//////////////////////////////////////////////////////////////////////////
XBOOL CPlugin_BMIndex::Plugin_Timezone_BMIndex(LPCXSTR lpszHigh, LPCXSTR lpszWeight, XCHAR* ptszMsgBufer, int* pInt_Len)
{
BMIndex_IsErrorOccur = XFALSE;
BMIndex_IsErrorOccur = FALSE;
Json::Value st_JsonRoot;
Json::Value st_JsonObject;
Json::StreamWriterBuilder st_JsonBuilder;
double dlHigh = _ttof(lpszHigh);
double dlWeight = _ttof(lpszWeight);
double dlHigh = _ttxof(lpszHigh);
double dlWeight = _ttxof(lpszWeight);
double dlValue = dlWeight / (dlHigh * dlHigh);
if (dlValue < 18.5)
{
......@@ -133,5 +133,5 @@ XBOOL CPlugin_BMIndex::Plugin_Timezone_BMIndex(LPCXSTR lpszHigh, LPCXSTR lpszWei
*pInt_Len = Json::writeString(st_JsonBuilder, st_JsonRoot).length();
memcpy(ptszMsgBufer, Json::writeString(st_JsonBuilder, st_JsonRoot).c_str(), *pInt_Len);
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/dllmain.cpp
浏览文件 @ ee641df1
......@@ -14,6 +14,6 @@ XBOOL APIENTRY DllMain( HMODULE hModule,
case DLL_PROCESS_DETACH:
break;
}
return XTRUE;
return TRUE;
}
XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/pch.cpp
浏览文件 @ ee641df1
......@@ -11,7 +11,7 @@
// Purpose: 导出实现
// History:
*********************************************************************/
XBOOL BMIndex_IsErrorOccur = XFALSE;
XBOOL BMIndex_IsErrorOccur = FALSE;
XLONG BMIndex_dwErrorCode = 0;
//////////////////////////////////////////////////////////////////////////
CPlugin_BMIndex m_PluginBMIndex;
......
XEngine_Source/XEngine_PluginModule/ModulePlugin_IPAddr/ModulePlugin_IPAddr.vcxproj
浏览文件 @ ee641df1
......@@ -31,27 +31,27 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
......
XEngine_Source/XEngine_PluginModule/ModulePlugin_IPAddr/ModulePlugin_Interface/ModulePlugin_Interface.cpp
浏览文件 @ ee641df1
......@@ -35,7 +35,7 @@ CModulePlugin_Interface::~CModulePlugin_Interface()
*********************************************************************/
XBOOL CModulePlugin_Interface::PluginCore_Init(XPVOID lParam)
{
IPAddr_IsErrorOccur = XFALSE;
IPAddr_IsErrorOccur = FALSE;
const char* db_path = "./XEngine_DBFile/ip2region.xdb";
// 1、从 db_path 初始化 xdb 查询对象
......@@ -43,9 +43,9 @@ XBOOL CModulePlugin_Interface::PluginCore_Init(XPVOID lParam)
if (err != 0)
{
printf("failed to create xdb searcher from `%s` with errno=%d\n", db_path, err);
return XFALSE;
return FALSE;
}
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：PluginCore_UnInit
......@@ -57,7 +57,7 @@ XBOOL CModulePlugin_Interface::PluginCore_Init(XPVOID lParam)
*********************************************************************/
void CModulePlugin_Interface::PluginCore_UnInit()
{
IPAddr_IsErrorOccur = XFALSE;
IPAddr_IsErrorOccur = FALSE;
xdb_close(&st_DBSearch);
}
/********************************************************************
......@@ -70,13 +70,13 @@ void CModulePlugin_Interface::PluginCore_UnInit()
*********************************************************************/
XBOOL CModulePlugin_Interface::PluginCore_Call(XCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBuffer, int nMsgLen)
{
IPAddr_IsErrorOccur = XFALSE;
IPAddr_IsErrorOccur = FALSE;
if ((NULL == pInt_HTTPCode) || (NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
{
IPAddr_IsErrorOccur = XTRUE;
IPAddr_IsErrorOccur = TRUE;
IPAddr_dwErrorCode = ERROR_XENGINE_APISERVICE_PLUGIN_MODULE_IPADDR_PARAMENT;
return XFALSE;
return FALSE;
}
XCHAR tszKeyName[128];
XCHAR tszMsgBuffer[128];
......@@ -92,12 +92,12 @@ XBOOL CModulePlugin_Interface::PluginCore_Call(XCHAR*** pppHDRList, int nListCou
BaseLib_OperatorString_GetKeyValue((*pppHDRList)[1], "=", tszKeyName, st_IPAddr.tszIPAddr);
if (0 != xdb_search_by_string(&st_DBSearch, st_IPAddr.tszIPAddr, tszMsgBuffer, sizeof(tszMsgBuffer)))
{
IPAddr_IsErrorOccur = XTRUE;
IPAddr_IsErrorOccur = TRUE;
IPAddr_dwErrorCode = ERROR_XENGINE_APISERVICE_PLUGIN_MODULE_IPADDR_NOTFOUND;
return XFALSE;
return FALSE;
}
//中国|0|内蒙古|通辽市|联通
_stscanf(tszMsgBuffer, _T("%[^|]|%[^|]|%[^|]|%[^|]|%[^|]"), st_IPAddr.tszIPCountry, st_IPAddr.tszIPCounty, st_IPAddr.tszIPProvince, st_IPAddr.tszIPCity, st_IPAddr.tszIPISP);
_stxscanf(tszMsgBuffer, _X("%[^|]|%[^|]|%[^|]|%[^|]|%[^|]"), st_IPAddr.tszIPCountry, st_IPAddr.tszIPCounty, st_IPAddr.tszIPProvince, st_IPAddr.tszIPCity, st_IPAddr.tszIPISP);
st_JsonObject["tszIPAddr"] = st_IPAddr.tszIPAddr;
st_JsonObject["tszIPCountry"] = st_IPAddr.tszIPCountry;
st_JsonObject["tszIPProvince"] = st_IPAddr.tszIPProvince;
......@@ -114,5 +114,5 @@ XBOOL CModulePlugin_Interface::PluginCore_Call(XCHAR*** pppHDRList, int nListCou
*pInt_HTTPCode = 200;
*pInt_MsgLen = Json::writeString(st_JsonBuilder, st_JsonRoot).length();
memcpy(ptszMsgBuffer, Json::writeString(st_JsonBuilder, st_JsonRoot).c_str(), *pInt_MsgLen);
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_PluginModule/ModulePlugin_IPAddr/dllmain.cpp
浏览文件 @ ee641df1
......@@ -14,5 +14,5 @@ XBOOL APIENTRY DllMain( HMODULE hModule,
case DLL_PROCESS_DETACH:
break;
}
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_PluginModule/ModulePlugin_IPAddr/pch.cpp
浏览文件 @ ee641df1
......@@ -11,7 +11,7 @@
// Purpose: 导出实现
// History:
*********************************************************************/
XBOOL IPAddr_IsErrorOccur = XFALSE;
XBOOL IPAddr_IsErrorOccur = FALSE;
XLONG IPAddr_dwErrorCode = 0;
//////////////////////////////////////////////////////////////////////////
CModulePlugin_Interface m_PluginIPAddr;
......
XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/ModulePlugin_Meter.vcxproj
浏览文件 @ ee641df1
......@@ -31,27 +31,27 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
......
XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/Plugin_Meter/Plugin_Meter.cpp
浏览文件 @ ee641df1
......@@ -35,9 +35,9 @@ CPlugin_Meter::~CPlugin_Meter()
*********************************************************************/
XBOOL CPlugin_Meter::PluginCore_Init(XPVOID lParam)
{
Meter_IsErrorOccur = XFALSE;
Meter_IsErrorOccur = FALSE;
return XTRUE;
return TRUE;
}
/********************************************************************
函数名称：PluginCore_UnInit
......@@ -49,7 +49,7 @@ XBOOL CPlugin_Meter::PluginCore_Init(XPVOID lParam)
*********************************************************************/
void CPlugin_Meter::PluginCore_UnInit()
{
Meter_IsErrorOccur = XFALSE;
Meter_IsErrorOccur = FALSE;
}
/********************************************************************
函数名称：PluginCore_Call
......@@ -61,13 +61,13 @@ void CPlugin_Meter::PluginCore_UnInit()
*********************************************************************/
XBOOL CPlugin_Meter::PluginCore_Call(XCHAR*** pppHDRList, int nListCount, int* pInt_HTTPCode, XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszMsgBuffer, int nMsgLen)
{
Meter_IsErrorOccur = XFALSE;
Meter_IsErrorOccur = FALSE;
if ((NULL == pInt_HTTPCode) || (NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
{
Meter_IsErrorOccur = XTRUE;
Meter_IsErrorOccur = TRUE;
Meter_dwErrorCode = ERROR_XENGINE_APISERVICE_PLUGIN_MODULE_METER_PARAMENT;
return XFALSE;
return FALSE;
}
XCHAR tszKeyName[128];
XCHAR tszParamType[128];
......@@ -88,26 +88,26 @@ XBOOL CPlugin_Meter::PluginCore_Call(XCHAR*** pppHDRList, int nListCount, int* p
BaseLib_OperatorString_GetKeyValue((*pppHDRList)[2], "=", tszKeyName, tszParamSource);
BaseLib_OperatorString_GetKeyValue((*pppHDRList)[3], "=", tszKeyName, tszParamValue);
if (0 == _ttoi(tszParamType))
if (0 == _ttxoi(tszParamType))
{
Plugin_Meter_LengthConvert(_ttoi(tszParamSource), _ttoi64(tszParamValue), &st_JsonObject);
Plugin_Meter_LengthConvert(_ttxoi(tszParamSource), _ttxoll(tszParamValue), &st_JsonObject);
}
else if (1 == _ttoi(tszParamType))
else if (1 == _ttxoi(tszParamType))
{
Plugin_Meter_TemperatureConvert(_ttoi(tszParamSource), _ttoi64(tszParamValue), &st_JsonObject);
Plugin_Meter_TemperatureConvert(_ttxoi(tszParamSource), _ttxoll(tszParamValue), &st_JsonObject);
}
else if (2 == _ttoi(tszParamType))
else if (2 == _ttxoi(tszParamType))
{
Plugin_Meter_PowerConvert(_ttoi(tszParamSource), _ttoi64(tszParamValue), &st_JsonObject);
Plugin_Meter_PowerConvert(_ttxoi(tszParamSource), _ttxoll(tszParamValue), &st_JsonObject);
}
else if (3 == _ttoi(tszParamType))
else if (3 == _ttxoi(tszParamType))
{
Plugin_Meter_SpeedConvert(_ttoi(tszParamSource), _ttoi64(tszParamValue), &st_JsonObject);
Plugin_Meter_SpeedConvert(_ttxoi(tszParamSource), _ttxoll(tszParamValue), &st_JsonObject);
}
st_JsonObject["tszParamType"] = _ttoi(tszParamType);
st_JsonObject["tszParamSource"] = _ttoi(tszParamSource);
st_JsonObject["tszParamValue"] = _ttof(tszParamValue);
st_JsonObject["tszParamType"] = _ttxoi(tszParamType);
st_JsonObject["tszParamSource"] = _ttxoi(tszParamSource);
st_JsonObject["tszParamValue"] = _ttxof(tszParamValue);
st_JsonRoot["data"] = st_JsonObject;
st_JsonRoot["code"] = 0;
......@@ -117,14 +117,14 @@ XBOOL CPlugin_Meter::PluginCore_Call(XCHAR*** pppHDRList, int nListCount, int* p
*pInt_HTTPCode = 200;
*pInt_MsgLen = Json::writeString(st_JsonBuilder, st_JsonRoot).length();
memcpy(ptszMsgBuffer, Json::writeString(st_JsonBuilder, st_JsonRoot).c_str(), *pInt_MsgLen);
return XTRUE;
return TRUE;
}
//////////////////////////////////////////////////////////////////////////
// 保护函数
//////////////////////////////////////////////////////////////////////////
XBOOL CPlugin_Meter::Plugin_Meter_LengthConvert(int nSource, __int64x nValue, Json::Value *pSt_JsonObject)
{
Meter_IsErrorOccur = XFALSE;
Meter_IsErrorOccur = FALSE;
Json::Value st_JsonObejct;
if (ENUM_APISERVICE_PLUGIN_METER_LENGTH_KILOMETRE == nSource)
......@@ -191,11 +191,11 @@ XBOOL CPlugin_Meter::Plugin_Meter_LengthConvert(int nSource, __int64x nValue, Js
st_JsonObejct["foot"] = double(nValue * 0.32808399);
}
(*pSt_JsonObject)["Length"] = st_JsonObejct;
return XTRUE;
return TRUE;
}
XBOOL CPlugin_Meter::Plugin_Meter_TemperatureConvert(int nSource, __int64x nValue, Json::Value* pSt_JsonObject)
{
Meter_IsErrorOccur = XFALSE;
Meter_IsErrorOccur = FALSE;
Json::Value st_JsonObejct;
if (ENUM_APISERVICE_PLUGIN_METER_TEMPERATURE_C == nSource)
......@@ -206,11 +206,11 @@ XBOOL CPlugin_Meter::Plugin_Meter_TemperatureConvert(int nSource, __int64x nValu
st_JsonObejct["degree"] = double(nValue * 0.8);
}
(*pSt_JsonObject)["Temperature"] = st_JsonObejct;
return XTRUE;
return TRUE;
}
XBOOL CPlugin_Meter::Plugin_Meter_PowerConvert(int nSource, __int64x nValue, Json::Value* pSt_JsonObject)
{
Meter_IsErrorOccur = XFALSE;
Meter_IsErrorOccur = FALSE;
Json::Value st_JsonObejct;
if (ENUM_APISERVICE_PLUGIN_METER_POWER_W == nSource)
......@@ -220,11 +220,11 @@ XBOOL CPlugin_Meter::Plugin_Meter_PowerConvert(int nSource, __int64x nValue, Jso
st_JsonObejct["ps"] = double(nValue * 0.00136);
}
(*pSt_JsonObject)["Power"] = st_JsonObejct;
return XTRUE;
return TRUE;
}
XBOOL CPlugin_Meter::Plugin_Meter_SpeedConvert(int nSource, __int64x nValue, Json::Value* pSt_JsonObject)
{
Meter_IsErrorOccur = XFALSE;
Meter_IsErrorOccur = FALSE;
Json::Value st_JsonObejct;
if (ENUM_APISERVICE_PLUGIN_METER_SPEED_KNOT == nSource)
......@@ -243,5 +243,5 @@ XBOOL CPlugin_Meter::Plugin_Meter_SpeedConvert(int nSource, __int64x nValue, Jso
st_JsonObejct["kilometer"] = double(nValue * 00.621);
}
(*pSt_JsonObject)["Power"] = st_JsonObejct;
return XTRUE;
return TRUE;
}
\ No newline at end of file
XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/dllmain.cpp
浏览文件 @ ee641df1
......@@ -14,6 +14,6 @@ XBOOL APIENTRY DllMain( HMODULE hModule,
case DLL_PROCESS_DETACH:
break;
}
return XTRUE;
return TRUE;
}
XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/pch.cpp
浏览文件 @ ee641df1
......@@ -11,7 +11,7 @@
// Purpose: 导出实现
// History:
*********************************************************************/
XBOOL Meter_IsErrorOccur = XFALSE;
XBOOL Meter_IsErrorOccur = FALSE;
XLONG Meter_dwErrorCode = 0;
//////////////////////////////////////////////////////////////////////////
CPlugin_Meter m_PluginMeter;
......
XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/ModulePlugin_Password.vcxproj
浏览文件 @ ee641df1
......@@ -31,27 +31,27 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
......
XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/dllmain.cpp
浏览文件 @ ee641df1
......@@ -14,6 +14,6 @@ XBOOL APIENTRY DllMain( HMODULE hModule,
case DLL_PROCESS_DETACH:
break;
}
return XTRUE;
return TRUE;
}
XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/pch.cpp
浏览文件 @ ee641df1
......@@ -11,7 +11,7 @@
// Purpose: 导出实现
// History:
*********************************************************************/
XBOOL Pass_IsErrorOccur = XFALSE;
XBOOL Pass_IsErrorOccur = FALSE;
XLONG Pass_dwErrorCode = 0;
//////////////////////////////////////////////////////////////////////////
CPlugin_Password m_PluginPass;
......
XEngine_Source/XEngine_PluginModule/ModulePlugin_Phone/ModulePlugin_Phone.vcxproj
浏览文件 @ ee641df1
......@@ -31,27 +31,27 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
......
XEngine_Source/XEngine_PluginModule/ModulePlugin_Phone/dllmain.cpp
浏览文件 @ ee641df1
......@@ -14,6 +14,6 @@ XBOOL APIENTRY DllMain( HMODULE hModule,
case DLL_PROCESS_DETACH:
break;
}
return XTRUE;
return TRUE;
}
XEngine_Source/XEngine_PluginModule/ModulePlugin_Phone/pch.cpp
浏览文件 @ ee641df1
......@@ -11,7 +11,7 @@
// Purpose: 导出实现
// History:
*********************************************************************/
XBOOL Phone_IsErrorOccur = XFALSE;
XBOOL Phone_IsErrorOccur = FALSE;
XLONG Phone_dwErrorCode = 0;
//////////////////////////////////////////////////////////////////////////
CModulePlugin_APIPhone m_PluginPhone;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或