Skip to content

Commit 9e631e2

Browse files
xengine-qytxengine-qyt
committed
added:server function show
1 parent 78a6d72 commit 9e631e2

File tree

5 files changed

+44
-11
lines changed

5 files changed

+44
-11
lines changed

‎XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/ModulePlugin_BMIndex.vcxproj‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,20 @@
3737
<UseDebugLibraries>false</UseDebugLibraries>
3838
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
40-
<CharacterSet>Unicode</CharacterSet>
40+
<CharacterSet>MultiByte</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
4545
<PlatformToolset>v143</PlatformToolset>
46-
<CharacterSet>Unicode</CharacterSet>
46+
<CharacterSet>MultiByte</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>DynamicLibrary</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
5151
<PlatformToolset>v143</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
53-
<CharacterSet>Unicode</CharacterSet>
53+
<CharacterSet>MultiByte</CharacterSet>
5454
</PropertyGroup>
5555
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5656
<ImportGroup Label="ExtensionSettings">
@@ -75,6 +75,18 @@
7575
<IncludePath>../../XEngine_ThirdPart/jsoncpp;$(XEngine_Include);$(IncludePath)</IncludePath>
7676
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
7777
</PropertyGroup>
78+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
79+
<IncludePath>$(XEngine_Include);../../XEngine_ThirdPart/jsoncpp;$(IncludePath)</IncludePath>
80+
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
81+
</PropertyGroup>
82+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
83+
<IncludePath>$(XEngine_Include);../../XEngine_ThirdPart/jsoncpp;$(IncludePath)</IncludePath>
84+
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
85+
</PropertyGroup>
86+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
87+
<IncludePath>$(XEngine_Include);../../XEngine_ThirdPart/jsoncpp;$(IncludePath)</IncludePath>
88+
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
89+
</PropertyGroup>
7890
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7991
<ClCompile>
8092
<WarningLevel>Level3</WarningLevel>

‎XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/ModulePlugin_Timezone.vcxproj‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,20 @@
3737
<UseDebugLibraries>false</UseDebugLibraries>
3838
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
40-
<CharacterSet>Unicode</CharacterSet>
40+
<CharacterSet>MultiByte</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
4545
<PlatformToolset>v143</PlatformToolset>
46-
<CharacterSet>Unicode</CharacterSet>
46+
<CharacterSet>MultiByte</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>DynamicLibrary</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
5151
<PlatformToolset>v143</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
53-
<CharacterSet>Unicode</CharacterSet>
53+
<CharacterSet>MultiByte</CharacterSet>
5454
</PropertyGroup>
5555
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5656
<ImportGroup Label="ExtensionSettings">
@@ -75,6 +75,18 @@
7575
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
7676
<OutDir>$(SolutionDir)$(Configuration)\XEngine_Plugin\</OutDir>
7777
</PropertyGroup>
78+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
79+
<IncludePath>$(XEngine_Include);../../XEngine_ThirdPart/jsoncpp;$(IncludePath)</IncludePath>
80+
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
81+
</PropertyGroup>
82+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
83+
<IncludePath>$(XEngine_Include);../../XEngine_ThirdPart/jsoncpp;$(IncludePath)</IncludePath>
84+
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
85+
</PropertyGroup>
86+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
87+
<IncludePath>$(XEngine_Include);../../XEngine_ThirdPart/jsoncpp;$(IncludePath)</IncludePath>
88+
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
89+
</PropertyGroup>
7890
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7991
<ClCompile>
8092
<WarningLevel>Level3</WarningLevel>
@@ -97,7 +109,7 @@
97109
<FunctionLevelLinking>true</FunctionLevelLinking>
98110
<IntrinsicFunctions>true</IntrinsicFunctions>
99111
<SDLCheck>true</SDLCheck>
100-
<PreprocessorDefinitions>WIN32;NDEBUG;MODULEPLUGINTIMEZONE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
112+
<PreprocessorDefinitions>WIN32;NDEBUG;MODULEPLUGINTIMEZONE_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
101113
<ConformanceMode>true</ConformanceMode>
102114
<PrecompiledHeader>Use</PrecompiledHeader>
103115
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -115,7 +127,7 @@
115127
<ClCompile>
116128
<WarningLevel>Level3</WarningLevel>
117129
<SDLCheck>true</SDLCheck>
118-
<PreprocessorDefinitions>_DEBUG;MODULEPLUGINTIMEZONE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
130+
<PreprocessorDefinitions>_DEBUG;MODULEPLUGINTIMEZONE_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
119131
<ConformanceMode>true</ConformanceMode>
120132
<PrecompiledHeader>Use</PrecompiledHeader>
121133
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -133,7 +145,7 @@
133145
<FunctionLevelLinking>true</FunctionLevelLinking>
134146
<IntrinsicFunctions>true</IntrinsicFunctions>
135147
<SDLCheck>true</SDLCheck>
136-
<PreprocessorDefinitions>NDEBUG;MODULEPLUGINTIMEZONE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148+
<PreprocessorDefinitions>NDEBUG;MODULEPLUGINTIMEZONE_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
137149
<ConformanceMode>true</ConformanceMode>
138150
<PrecompiledHeader>Use</PrecompiledHeader>
139151
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Configure.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,17 @@
1313
BOOL XEngine_Configure_Parament(int argc, char** argv, XENGINE_SERVICECONFIG* pSt_Configure)
1414
{
1515
LPCTSTR lpszConfigFile = _T("./XEngine_Config/XEngine_Config.json");
16+
LPCTSTR lpszOPtionFile = _T("./XEngine_Config/XEngine_OPtionConfig.json");
1617

1718
if (!ModuleConfigure_Json_File(lpszConfigFile, pSt_Configure))
1819
{
1920
printf("解析配置文件失败,ModuleConfigure_Json_File:%lX\n", ModuleConfigure_GetLastError());
2021
return FALSE;
22+
}
23+
if (!ModuleConfigure_File_OPtion(lpszOPtionFile, &st_OPtionList))
24+
{
25+
printf("解析配置文件失败,ModuleConfigure_File_OPtion:%lX\n", ModuleConfigure_GetLastError());
26+
return FALSE;
2127
}
2228

2329
for (int i = 0; i < argc; i++)

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Hdr.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ extern XNETHANDLE xhHTTPPool;
8686
extern XENGINE_SERVICECONFIG st_ServiceConfig;
8787
extern XENGINE_OPENCCCONFIG st_OPenccConfig;
8888
extern XENGINE_PLUGINCONFIG st_PluginConfig;
89+
extern XENGINE_OPTIONLIST st_OPtionList;
8990
//连接库
9091
#ifdef _WINDOWS
9192
#ifdef _WIN64

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HttpApp.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ XNETHANDLE xhHTTPPool = 0;
2121
XENGINE_SERVICECONFIG st_ServiceConfig;
2222
XENGINE_OPENCCCONFIG st_OPenccConfig;
2323
XENGINE_PLUGINCONFIG st_PluginConfig;
24+
XENGINE_OPTIONLIST st_OPtionList;
2425

2526
void ServiceApp_Stop(int signo)
2627
{
@@ -244,9 +245,8 @@ int main(int argc, char** argv)
244245
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中,初始化插件系统失败,错误：%lX"), ModulePlugin_GetLastError());
245246
goto XENGINE_SERVICEAPP_EXIT;
246247
}
247-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中,初始化插件系统成功"));
248248
//加载插件
249-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中,开始加载插件,总共:%d 插件"), st_PluginConfig.pStl_ListPlugin->size());
249+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中,初始化插件系统成功,开始加载插件"));
250250
{
251251
list<XENGINE_PLUGININFO>::const_iterator stl_ListIterator = st_PluginConfig.pStl_ListPlugin->begin();
252252
for (int i = 1; stl_ListIterator != st_PluginConfig.pStl_ListPlugin->end(); stl_ListIterator++, i++)
@@ -268,6 +268,8 @@ int main(int argc, char** argv)
268268
}
269269
}
270270
}
271+
//展示能力
272+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中,加载的基本查询服务总:%d 个,插件:%d 个"), st_OPtionList.stl_ListBase.size(), st_OPtionList.stl_ListPlug.size());
271273

272274
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());
273275
while (TRUE)

0 commit comments

Comments
 (0)