diff --git a/CHANGELOG b/CHANGELOG index bcc6b156f04c149d62d62d3f6d8250a61a4a5e9e..42c86b4e42667fecf4385333ec74302ef746a220 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,13 @@ +XEngine_APIService V2.6.1.1001 + +修正:在linux系统下无法加载模块插件的问题 +修正:linux 构建错误 +删除:服务器能力查询相关功能 + +fixed:cant load lib plugin moudle in linux +fixed:linux build error +delete:service option function support +====================================================================================== XEngine_APIService V2.6.0.1001 添加:lua插件支持 diff --git a/README.en.md b/README.en.md index 2ed969c3a220642c1c449571df9f06aca0767aa0..b1c4effb78d59a49f08eec2893996ede4a0dc480 100644 --- a/README.en.md +++ b/README.en.md @@ -43,6 +43,7 @@ Support privatization deployment, free, safe, open source, controllable 23. short url creator 24. local system time 25. math Calculation +26. log service(plan) ## install diff --git a/README.md b/README.md index cf85829e05594f1834bcbf7d70fd5c1d1d8e37cf..2de3a74a92871aabbdb19c2a83ee39ac818caa29 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ c c++ interface api service 23. 短连接生成 24. 本地标准时间 25. 数学计算 +26. 日志服务(计划中) ## 安装教程 diff --git a/XEngine_Docment/Docment_en.docx b/XEngine_Docment/Docment_en.docx index 0627986ab1a85678108ba4d2f0d93e4728cab11c..74b15df5de8c3abe74463adcaf9427640a620cc0 100644 Binary files a/XEngine_Docment/Docment_en.docx and b/XEngine_Docment/Docment_en.docx differ diff --git a/XEngine_Docment/Docment_zh.docx b/XEngine_Docment/Docment_zh.docx index b1390fcc3eb167745b8f61947020d76598996965..489d1eb58408f940fba15d94dd100d53681ee421 100644 Binary files a/XEngine_Docment/Docment_zh.docx and b/XEngine_Docment/Docment_zh.docx differ diff --git a/XEngine_Release/XEngine_Config/XEngine_Config.json b/XEngine_Release/XEngine_Config/XEngine_Config.json index 5199f3a91a5c5107576f1cfaa79a181076747344..8185154466bb1a0d9619f55927205f3fb9dffdfa 100644 --- a/XEngine_Release/XEngine_Config/XEngine_Config.json +++ b/XEngine_Release/XEngine_Config/XEngine_Config.json @@ -33,6 +33,7 @@ "tszPluginLua":"./XEngine_Config/XEngine_PluginLua.json" }, "XVer":[ + "2.6.1.1001 Build20221213", "2.6.0.1001 Build20221212", "2.5.0.1001 Build20221102", "2.4.0.1001 Build20220902", diff --git a/XEngine_Release/XEngine_Config/XEngine_OPtionConfig.json b/XEngine_Release/XEngine_Config/XEngine_OPtionConfig.json deleted file mode 100644 index 1366c5f8c64b53ffc15c9282b3cf6f8ccb6ecd88..0000000000000000000000000000000000000000 --- a/XEngine_Release/XEngine_Config/XEngine_OPtionConfig.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "OPTionBase": [{ - "OPTionEnable": true, - "OPTionMethod": "ip", - "OPTionNote": "IP地址信息查询", - "OPTionExample": "http://%s/api?function=ip¶ms1=1.29.164.255¶ms2=0" - }, - { - "OPTionEnable": true, - "OPTionMethod": "id", - "OPTionNote": "身份证信息查询", - "OPTionExample": "http://%s/api?function=id¶ms1=511025191101018792¶ms2=0" - }, - { - "OPTionEnable": true, - "OPTionMethod": "phone", - "OPTionNote": "电话号码查询", - "OPTionExample": "http://%s/api?function=phone¶ms1=13699428888¶ms2=0" - }, - { - "OPTionEnable": true, - "OPTionMethod": "bank", - "OPTionNote": "银行卡验证", - "OPTionExample": "http://%s/api?function=bank¶ms1=6214000000¶ms2=0" - }, - { - "OPTionEnable": true, - "OPTionMethod": "language", - "OPTionNote": "语言转换", - "OPTionExample": "http://%s/api?function=language¶ms1=繁体到简体¶ms2=0¶ms3=1" - }, - { - "OPTionEnable": true, - "OPTionMethod": "translation", - "OPTionNote": "翻译", - "OPTionExample": "http://%s/api?function=translation¶ms1=中国¶ms2=0¶ms3=0" - }, - { - "OPTionEnable": true, - "OPTionMethod": "lock", - "OPTionNote": "分布式锁", - "OPTionExample": "http://%s/api?function=lock¶ms1=0¶ms2=12319824824" - }, - { - "OPTionEnable": true, - "OPTionMethod": "p2p", - "OPTionNote": "p2p网络", - "OPTionExample": "参考文档" - }, - { - "OPTionEnable": true, - "OPTionMethod": "cdkey", - "OPTionNote": "cdkey授权生成", - "OPTionExample": "参考文档" - }, - { - "OPTionEnable": true, - "OPTionMethod": "zipcode", - "OPTionNote": "行政邮编信息", - "OPTionExample": "参考文档" - } - ] -} \ No newline at end of file diff --git a/XEngine_Source/XEngine_ModuleConfigure/Makefile b/XEngine_Source/XEngine_ModuleConfigure/Makefile index fe8e7368e400f640bc8c18d08ac48f195c791df9..8a6eb511f8ca6d2f903752244245905883624618 100644 --- a/XEngine_Source/XEngine_ModuleConfigure/Makefile +++ b/XEngine_Source/XEngine_ModuleConfigure/Makefile @@ -8,7 +8,7 @@ LOADBIN = -L ../XEngine_ThirdPart/jsoncpp LIB = -ljsoncpp LIBEX = -ldl -lpthread LOADSO = -Wl,-rpath=./,--disable-new-dtags -LIBINCLUDE = ModuleConfigure_Json.o ModuleConfigure_File.o pch.o +LIBINCLUDE = ModuleConfigure_Json.o pch.o ifeq ($(shell uname),Darwin) SHAREDLL = dylib @@ -39,8 +39,6 @@ all:$(LIBINCLUDE) ModuleConfigure_Json.o:./ModuleConfigure_Json/ModuleConfigure_Json.cpp $(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./ModuleConfigure_Json/ModuleConfigure_Json.cpp -ModuleConfigure_File.o:./ModuleConfigure_File/ModuleConfigure_File.cpp - $(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./ModuleConfigure_File/ModuleConfigure_File.cpp pch.o:./pch.cpp $(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./pch.cpp diff --git a/XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h b/XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h index a5fdc5ba1d374053a504b888250c0c1c7e83fbde..79564d1ac6354ace13c0da73d8d42d9132f7cee3 100644 --- a/XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h +++ b/XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h @@ -162,26 +162,4 @@ extern "C" BOOL ModuleConfigure_Json_OPenccFile(LPCTSTR lpszConfigFile, XENGINE_ 意思：是否成功 备注： *********************************************************************/ -extern "C" BOOL ModuleConfigure_Json_PluginFile(LPCTSTR lpszConfigFile, XENGINE_PLUGINCONFIG* pSt_PluginConfig); -/************************************************************************/ -/* 其他内容读取 */ -/************************************************************************/ -/******************************************************************** -函数名称：ModuleConfigure_File_OPtion -函数功能：服务器可用方法查询配置文件 - 参数.一：lpszConfigFile - In/Out：In - 类型：常量字符指针 - 可空：N - 意思：输入要读取的配置文件 - 参数.二：pSt_OPtionList - In/Out：Out - 类型：数据结构指针 - 可空：N - 意思：输出信息列表 -返回值 - 类型：逻辑型 - 意思：是否成功 -备注： -*********************************************************************/ -extern "C" BOOL ModuleConfigure_File_OPtion(LPCTSTR lpszConfigFile, XENGINE_OPTIONLIST* pSt_OPtionList); \ No newline at end of file +extern "C" BOOL ModuleConfigure_Json_PluginFile(LPCTSTR lpszConfigFile, XENGINE_PLUGINCONFIG* pSt_PluginConfig); \ No newline at end of file diff --git a/XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_File/ModuleConfigure_File.cpp b/XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_File/ModuleConfigure_File.cpp deleted file mode 100644 index 5038774cdcf18601052e83772f23d3b12774d096..0000000000000000000000000000000000000000 --- a/XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_File/ModuleConfigure_File.cpp +++ /dev/null @@ -1,105 +0,0 @@ -#include "pch.h" -#include "ModuleConfigure_File.h" -/******************************************************************** -// Created: 2022/07/21 17:07:28 -// File Name: H:\XEngine_APIService\XEngine_Source\XEngine_ModuleConfigure\ModuleConfigure_File\ModuleConfigure_File.cpp -// File Path: H:\XEngine_APIService\XEngine_Source\XEngine_ModuleConfigure\ModuleConfigure_File -// File Base: ModuleConfigure_File -// File Ext: cpp -// Project: XEngine(网络通信引擎) -// Author: qyt -// Purpose: 文件信息读写 -// History: -*********************************************************************/ -CModuleConfigure_File::CModuleConfigure_File() -{ - -} -CModuleConfigure_File::~CModuleConfigure_File() -{ - -} -////////////////////////////////////////////////////////////////////////// -// 公用函数 -////////////////////////////////////////////////////////////////////////// -/******************************************************************** -函数名称：ModuleConfigure_File_OPtion -函数功能：服务器可用方法查询配置文件 - 参数.一：lpszConfigFile - In/Out：In - 类型：常量字符指针 - 可空：N - 意思：输入要读取的配置文件 - 参数.二：pSt_OPtionList - In/Out：Out - 类型：数据结构指针 - 可空：N - 意思：输出信息列表 -返回值 - 类型：逻辑型 - 意思：是否成功 -备注： -*********************************************************************/ -BOOL CModuleConfigure_File::ModuleConfigure_File_OPtion(LPCTSTR lpszConfigFile, XENGINE_OPTIONLIST* pSt_OPtionList) -{ - Config_IsErrorOccur = FALSE; - - if ((NULL == lpszConfigFile) || (NULL == pSt_OPtionList)) - { - Config_IsErrorOccur = TRUE; - Config_dwErrorCode = ERROR_MODULE_CONFIGURE_FILE_PARAMENT; - return FALSE; - } - Json::Value st_JsonRoot; - JSONCPP_STRING st_JsonError; - Json::CharReaderBuilder st_JsonBuilder; - //读取配置文件所有内容到缓冲区 - FILE* pSt_File = _tfopen(lpszConfigFile, _T("rb")); - if (NULL == pSt_File) - { - Config_IsErrorOccur = TRUE; - Config_dwErrorCode = ERROR_MODULE_CONFIGURE_FILE_OPENFILE; - return FALSE; - } - size_t nCount = 0; - TCHAR tszMsgBuffer[4096]; - while (1) - { - size_t nRet = fread(tszMsgBuffer + nCount, 1, 2048, pSt_File); - if (nRet <= 0) - { - break; - } - nCount += nRet; - } - fclose(pSt_File); - //开始解析配置文件 - std::unique_ptr const pSt_JsonReader(st_JsonBuilder.newCharReader()); - if (!pSt_JsonReader->parse(tszMsgBuffer, tszMsgBuffer + nCount, &st_JsonRoot, &st_JsonError)) - { - Config_IsErrorOccur = TRUE; - Config_dwErrorCode = ERROR_MODULE_CONFIGURE_FILE_PARSE; - return FALSE; - } - - if (st_JsonRoot["OPTionBase"].empty()) - { - Config_IsErrorOccur = TRUE; - Config_dwErrorCode = ERROR_MODULE_CONFIGURE_FILE_BASE; - return FALSE; - } - Json::Value st_JsonBase = st_JsonRoot["OPTionBase"]; - for (unsigned int i = 0; i < st_JsonBase.size(); i++) - { - XENGINE_OPTIONINFO st_OPTionInfo; - memset(&st_OPTionInfo, '\0', sizeof(XENGINE_OPTIONINFO)); - - st_OPTionInfo.bEnable = st_JsonBase[i]["OPTionEnable"].asBool(); - _tcscpy(st_OPTionInfo.tszOPMethod, st_JsonBase[i]["OPTionMethod"].asCString()); - _tcscpy(st_OPTionInfo.tszOPNote, st_JsonBase[i]["OPTionNote"].asCString()); - _tcscpy(st_OPTionInfo.tszOPExample, st_JsonBase[i]["OPTionExample"].asCString()); - - pSt_OPtionList->stl_ListBase.push_back(st_OPTionInfo); - } - return TRUE; -} \ No newline at end of file diff --git a/XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_File/ModuleConfigure_File.h b/XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_File/ModuleConfigure_File.h deleted file mode 100644 index 2a47d529e3b9f2548172cac1958c305d01fa6586..0000000000000000000000000000000000000000 --- a/XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_File/ModuleConfigure_File.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -/******************************************************************** -// Created: 2022/07/21 17:07:01 -// File Name: H:\XEngine_APIService\XEngine_Source\XEngine_ModuleConfigure\ModuleConfigure_File\ModuleConfigure_File.h -// File Path: H:\XEngine_APIService\XEngine_Source\XEngine_ModuleConfigure\ModuleConfigure_File -// File Base: ModuleConfigure_File -// File Ext: h -// Project: XEngine(网络通信引擎) -// Author: qyt -// Purpose: 文件信息读写 -// History: -*********************************************************************/ - -class CModuleConfigure_File -{ -public: - CModuleConfigure_File(); - ~CModuleConfigure_File(); -public: - BOOL ModuleConfigure_File_OPtion(LPCTSTR lpszConfigFile, XENGINE_OPTIONLIST* pSt_OPtionList); -protected: -private: -}; \ No newline at end of file diff --git a/XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp b/XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp index 49d6a314e92dd5cb7a7e8eef4427dfb968f73b9d..4cc04c05d06ff8387df551331946fd3e30e29dc8 100644 --- a/XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp +++ b/XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp @@ -317,7 +317,7 @@ BOOL CModuleConfigure_Json::ModuleConfigure_Json_PluginFile(LPCTSTR lpszConfigFi st_PluginInfo.bEnable = st_JsonArray[i]["PluginEnable"].asBool(); _tcscpy(st_PluginInfo.tszPluginFile, st_JsonArray[i]["PluginFile"].asCString()); - if (NULL == _tcsstr(st_PluginInfo.tszPluginFile,_T("."))) + if (NULL == _tcsstr(st_PluginInfo.tszPluginFile + 3,_T("."))) { #ifdef _MSC_BUILD _tcscat(st_PluginInfo.tszPluginFile, ".dll"); diff --git a/XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.def b/XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.def index 557f8c254dc308b5ae777de3e8c9297e89ebb328..892d206c25b7ec4e966b7e9fd638ac718f38a81e 100644 --- a/XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.def +++ b/XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.def @@ -5,6 +5,4 @@ EXPORTS ModuleConfigure_Json_File ModuleConfigure_Json_OPenccFile - ModuleConfigure_Json_PluginFile - - ModuleConfigure_File_OPtion \ No newline at end of file + ModuleConfigure_Json_PluginFile \ No newline at end of file diff --git a/XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj b/XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj index bc55d212b34c130d5dfeeb192b31fb063ca6bdaf..6d632fab0c5ff68cb28399781a80e77797d8a930 100644 --- a/XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj +++ b/XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj @@ -169,7 +169,6 @@ - @@ -177,7 +176,6 @@ - Create diff --git a/XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj.filters b/XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj.filters index cf21d2c1ff1a84989717248f7d75c03fd225c068..a8d85e7d07a8c6741f9666e2a63ffbe98e2a20bb 100644 --- a/XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj.filters +++ b/XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj.filters @@ -19,12 +19,6 @@ {865425d8-f7eb-4fb9-bcd1-8bb631209b4e} - - {6976af83-32b2-4404-a20e-2f619e57daad} - - - {6b6efe12-6349-4581-a649-d81c086fb267} - @@ -42,9 +36,6 @@ 头文件 - - 头文件\ModuleConfigure_File - @@ -56,9 +47,6 @@ 源文件\ModuleConfigure_Json - - 源文件\ModuleConfigure_File - diff --git a/XEngine_Source/XEngine_ModuleConfigure/pch.cpp b/XEngine_Source/XEngine_ModuleConfigure/pch.cpp index 9bad8c21efc7c59f4d83dbed7f4989326fd5c3f2..a411594c2e809c0d38b58cb84bc42748c08d0805 100644 --- a/XEngine_Source/XEngine_ModuleConfigure/pch.cpp +++ b/XEngine_Source/XEngine_ModuleConfigure/pch.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "ModuleConfigure_Json/ModuleConfigure_Json.h" -#include "ModuleConfigure_File/ModuleConfigure_File.h" /******************************************************************** // Created: 2021/12/02 16:20:26 // File Name: D:\XEngine_ServiceApp\XEngine_Source\XEngine_ModuleConfigure\pch.cpp @@ -16,7 +15,6 @@ BOOL Config_IsErrorOccur = FALSE; DWORD Config_dwErrorCode = 0; ////////////////////////////////////////////////////////////////////// CModuleConfigure_Json m_ConfigJson; -CModuleConfigure_File m_ConfigFile; ////////////////////////////////////////////////////////////////////// // 导出函数定义 ////////////////////////////////////////////////////////////////////// @@ -42,11 +40,4 @@ extern "C" BOOL ModuleConfigure_Json_OPenccFile(LPCTSTR lpszConfigFile, XENGINE_ extern "C" BOOL ModuleConfigure_Json_PluginFile(LPCTSTR lpszConfigFile, XENGINE_PLUGINCONFIG * pSt_PluginConfig) { return m_ConfigJson.ModuleConfigure_Json_PluginFile(lpszConfigFile, pSt_PluginConfig); -} -/************************************************************************/ -/* 其他内容读取 */ -/************************************************************************/ -extern "C" BOOL ModuleConfigure_File_OPtion(LPCTSTR lpszConfigFile, XENGINE_OPTIONLIST * pSt_OPtionList) -{ - return m_ConfigFile.ModuleConfigure_File_OPtion(lpszConfigFile, pSt_OPtionList); } \ No newline at end of file diff --git a/XEngine_Source/XEngine_ModulePlugin/Makefile b/XEngine_Source/XEngine_ModulePlugin/Makefile index ab3244b91a09bf09114750cc73f2bd60ae9b644b..eaab857137b49f47624836b95aa6d0e323b26731 100644 --- a/XEngine_Source/XEngine_ModulePlugin/Makefile +++ b/XEngine_Source/XEngine_ModulePlugin/Makefile @@ -3,12 +3,13 @@ SHAREFLAG = -shared SHAREDLL = so RELEASE = 0 UNICODE = 0 +FILECENTOS=/etc/redhat-release INCLUDE = -I ./ LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -LIB = -lXEngine_BaseLib +LIB = -lXEngine_BaseLib -llua5.3 LIBEX = -ldl -lpthread LOADSO = -Wl,-rpath=./,--disable-new-dtags -LIBINCLUDE = ModulePlugin_Core.o ModulePlugin_Loader.o pch.o +LIBINCLUDE = ModulePlugin_LibCore.o ModulePlugin_LuaCore.o ModulePlugin_Loader.o pch.o ifeq ($(shell uname),Darwin) SHAREDLL = dylib @@ -27,18 +28,20 @@ FLAGS = -c DEBUG = -g endif -ifeq ($(UNICODE),1) -UNICODE = -D _UNICODE +ifeq ($(FILECENTOS), $(wildcard $(FILECENTOS))) + UNICODE = -D _CENTOS else -UNICODE = + UNICODE = -D _UBUNTU endif all:$(LIBINCLUDE) $(CC) $(DEBUG) $(LIBINCLUDE) -o libXEngine_ModulePlugin.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO) -ModulePlugin_Core.o:./ModulePlugin_Core/ModulePlugin_Core.cpp - $(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./ModulePlugin_Core/ModulePlugin_Core.cpp +ModulePlugin_LibCore.o:./ModulePlugin_LibCore/ModulePlugin_LibCore.cpp + $(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./ModulePlugin_LibCore/ModulePlugin_LibCore.cpp +ModulePlugin_LuaCore.o:./ModulePlugin_LuaCore/ModulePlugin_LuaCore.cpp + $(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./ModulePlugin_LuaCore/ModulePlugin_LuaCore.cpp ModulePlugin_Loader.o:./ModulePlugin_Loader/ModulePlugin_Loader.cpp $(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./ModulePlugin_Loader/ModulePlugin_Loader.cpp diff --git a/XEngine_Source/XEngine_ModulePlugin/pch.h b/XEngine_Source/XEngine_ModulePlugin/pch.h index 54fdf777702559ec4d0f9ca12caedc9b9ceae6d6..ad6aef191f489ebf9b3b7bee05e235c76a2f85a7 100644 --- a/XEngine_Source/XEngine_ModulePlugin/pch.h +++ b/XEngine_Source/XEngine_ModulePlugin/pch.h @@ -11,15 +11,27 @@ // 添加要在此处预编译的标头 #include "framework.h" #include +#include #else #include + +#ifdef __linux__ +#ifdef _CENTOS +#include +#else +#include +#endif +#else +#include #endif +#endif + #endif //PCH_H + #include #include #include #include -#include #include #include #include diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/Makefile b/XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/Makefile index 232f7655613b60751f6980ff4496428b243a77f6..2c7af323b2869023be32efda5565e4e47a809327 100644 --- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/Makefile +++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/Makefile @@ -46,7 +46,7 @@ pch.o:./pch.cpp InstallAll:InstallSo InstallSo:./libModulePlugin_BMIndex.$(SHAREDLL) - cp ./libModulePlugin_BMIndex.$(SHAREDLL) ../../../XEngine_Release/XEngine_Plugin/libModulePlugin_BMIndex.$(SHAREDLL) + cp ./libModulePlugin_BMIndex.$(SHAREDLL) ../../../XEngine_Release/XEngine_LibPlugin/libModulePlugin_BMIndex.$(SHAREDLL) CleanAll:CleanObj CleanMk CleanObj: diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/Makefile b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/Makefile index f62a01dbc0b543a184ff1d1bc28e7debb8965b68..1cda5c95621b8aa9f24b09d078b1f4b0c6df649f 100644 --- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/Makefile +++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/Makefile @@ -46,7 +46,7 @@ pch.o:./pch.cpp InstallAll:InstallSo InstallSo:./libModulePlugin_Meter.$(SHAREDLL) - cp ./libModulePlugin_Meter.$(SHAREDLL) ../../../XEngine_Release/XEngine_Plugin/libModulePlugin_Meter.$(SHAREDLL) + cp ./libModulePlugin_Meter.$(SHAREDLL) ../../../XEngine_Release/XEngine_LibPlugin/libModulePlugin_Meter.$(SHAREDLL) CleanAll:CleanObj CleanMk CleanObj: diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/Makefile b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/Makefile index e5501821f177d73c08e09ce5f342ad9c4013f334..fa10ab29fa9228235e3af641c90c4ced5294f132 100644 --- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/Makefile +++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/Makefile @@ -46,7 +46,7 @@ pch.o:./pch.cpp InstallAll:InstallSo InstallSo:./libModulePlugin_Password.$(SHAREDLL) - cp ./libModulePlugin_Password.$(SHAREDLL) ../../../XEngine_Release/XEngine_Plugin/libModulePlugin_Password.$(SHAREDLL) + cp ./libModulePlugin_Password.$(SHAREDLL) ../../../XEngine_Release/XEngine_LibPlugin/libModulePlugin_Password.$(SHAREDLL) CleanAll:CleanObj CleanMk CleanObj: diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/Makefile b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/Makefile index d6baa1af5080d492dc8a2d13f848fa2d19276351..7c0151d2ca8a7a0312167e97a689fbc0c81e4997 100644 --- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/Makefile +++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/Makefile @@ -46,7 +46,7 @@ pch.o:./pch.cpp InstallAll:InstallSo InstallSo:./libModulePlugin_Timezone.$(SHAREDLL) - cp ./libModulePlugin_Timezone.$(SHAREDLL) ../../../XEngine_Release/XEngine_Plugin/libModulePlugin_Timezone.$(SHAREDLL) + cp ./libModulePlugin_Timezone.$(SHAREDLL) ../../../XEngine_Release/XEngine_LibPlugin/libModulePlugin_Timezone.$(SHAREDLL) CleanAll:CleanObj CleanMk CleanObj: diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Zodiac/Makefile b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Zodiac/Makefile index 08580dc71de086247d32657f5d6d7d38509bf206..fe8d368108729579a483b3101038dfa3929286f2 100644 --- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Zodiac/Makefile +++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Zodiac/Makefile @@ -46,7 +46,7 @@ pch.o:./pch.cpp InstallAll:InstallSo InstallSo:./libModulePlugin_Zodiac.$(SHAREDLL) - cp ./libModulePlugin_Zodiac.$(SHAREDLL) ../../../XEngine_Release/XEngine_Plugin/libModulePlugin_Zodiac.$(SHAREDLL) + cp ./libModulePlugin_Zodiac.$(SHAREDLL) ../../../XEngine_Release/XEngine_LibPlugin/libModulePlugin_Zodiac.$(SHAREDLL) CleanAll:CleanObj CleanMk CleanObj: diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Configure.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Configure.cpp index 9143a9d3ecaab88a10d9086410e888fc49f4dbd3..e30435034e13cfe73fa97302fc9cd376cbbf4b64 100644 --- a/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Configure.cpp +++ b/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Configure.cpp @@ -13,17 +13,11 @@ BOOL XEngine_Configure_Parament(int argc, char** argv, XENGINE_SERVICECONFIG* pSt_Configure) { LPCTSTR lpszConfigFile = _T("./XEngine_Config/XEngine_Config.json"); - LPCTSTR lpszOPtionFile = _T("./XEngine_Config/XEngine_OPtionConfig.json"); if (!ModuleConfigure_Json_File(lpszConfigFile, pSt_Configure)) { printf("解析配置文件失败,ModuleConfigure_Json_File:%lX\n", ModuleConfigure_GetLastError()); return FALSE; - } - if (!ModuleConfigure_File_OPtion(lpszOPtionFile, &st_OPtionList)) - { - printf("解析配置文件失败,ModuleConfigure_File_OPtion:%lX\n", ModuleConfigure_GetLastError()); - return FALSE; } for (int i = 0; i < argc; i++) diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Hdr.h b/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Hdr.h index 438ecf6a939816019e1c0e52580e6f70ef8ee04b..c126543f8ad8d03f0a17928812b4ab9166d3dede 100644 --- a/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Hdr.h +++ b/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Hdr.h @@ -92,7 +92,6 @@ extern XENGINE_SERVICECONFIG st_ServiceConfig; extern XENGINE_OPENCCCONFIG st_OPenccConfig; extern XENGINE_PLUGINCONFIG st_PluginLibConfig; extern XENGINE_PLUGINCONFIG st_PluginLuaConfig; -extern XENGINE_OPTIONLIST st_OPtionList; //连接库 #ifdef _WINDOWS #ifdef _WIN64 diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HttpApp.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HttpApp.cpp index 733c9aa1b67c575e6304b95b61864f2a6d5e71dd..bef9ad3146a18445ce2922c770919304e171d5e2 100644 --- a/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HttpApp.cpp +++ b/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HttpApp.cpp @@ -22,7 +22,6 @@ XENGINE_SERVICECONFIG st_ServiceConfig; XENGINE_OPENCCCONFIG st_OPenccConfig; XENGINE_PLUGINCONFIG st_PluginLibConfig; XENGINE_PLUGINCONFIG st_PluginLuaConfig; -XENGINE_OPTIONLIST st_OPtionList; void ServiceApp_Stop(int signo) { @@ -314,7 +313,7 @@ int main(int argc, char** argv) } } //展示能力 - XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中,加载的基本查询服务:%d 个,Lib插件:%d 个,Lua插件:%d 个"), st_OPtionList.stl_ListBase.size(), st_PluginLibConfig.pStl_ListPlugin->size(), st_PluginLuaConfig.pStl_ListPlugin->size()); + XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中,加载的Lib插件:%d 个,Lua插件:%d 个"), st_PluginLibConfig.pStl_ListPlugin->size(), st_PluginLuaConfig.pStl_ListPlugin->size()); XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("所有服务成功启动，服务运行中，XEngine版本:%s,发行版本次数:%d,当前版本：%s。。。"), BaseLib_OperatorVer_XGetStr(), st_ServiceConfig.st_XVer.pStl_ListVer->size(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str()); while (TRUE)