Skip to content

Commit 8c85747

Browse files
xengine-qytxengine-qyt
committed
delete:service option function support
1 parent ebb77e3 commit 8c85747

File tree

11 files changed

+4
-188
lines changed

11 files changed

+4
-188
lines changed

‎XEngine_Source/XEngine_ModuleConfigure/Makefile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LOADBIN = -L ../XEngine_ThirdPart/jsoncpp
88
LIB = -ljsoncpp
99
LIBEX = -ldl -lpthread
1010
LOADSO = -Wl,-rpath=./,--disable-new-dtags
11-
LIBINCLUDE = ModuleConfigure_Json.o ModuleConfigure_File.o pch.o
11+
LIBINCLUDE = ModuleConfigure_Json.o pch.o
1212

1313
ifeq ($(shell uname),Darwin)
1414
SHAREDLL = dylib
@@ -39,8 +39,6 @@ all:$(LIBINCLUDE)
3939

4040
ModuleConfigure_Json.o:./ModuleConfigure_Json/ModuleConfigure_Json.cpp
4141
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./ModuleConfigure_Json/ModuleConfigure_Json.cpp
42-
ModuleConfigure_File.o:./ModuleConfigure_File/ModuleConfigure_File.cpp
43-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./ModuleConfigure_File/ModuleConfigure_File.cpp
4442

4543
pch.o:./pch.cpp
4644
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./pch.cpp

‎XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -162,26 +162,4 @@ extern "C" BOOL ModuleConfigure_Json_OPenccFile(LPCTSTR lpszConfigFile, XENGINE_
162162
意思：是否成功
163163
备注：
164164
*********************************************************************/
165-
extern "C" BOOL ModuleConfigure_Json_PluginFile(LPCTSTR lpszConfigFile, XENGINE_PLUGINCONFIG* pSt_PluginConfig);
166-
/************************************************************************/
167-
/* 其他内容读取 */
168-
/************************************************************************/
169-
/********************************************************************
170-
函数名称：ModuleConfigure_File_OPtion
171-
函数功能：服务器可用方法查询配置文件
172-
参数.一：lpszConfigFile
173-
In/Out：In
174-
类型：常量字符指针
175-
可空：N
176-
意思：输入要读取的配置文件
177-
参数.二：pSt_OPtionList
178-
In/Out：Out
179-
类型：数据结构指针
180-
可空：N
181-
意思：输出信息列表
182-
返回值
183-
类型：逻辑型
184-
意思：是否成功
185-
备注：
186-
*********************************************************************/
187-
extern "C" BOOL ModuleConfigure_File_OPtion(LPCTSTR lpszConfigFile, XENGINE_OPTIONLIST* pSt_OPtionList);
165+
extern "C" BOOL ModuleConfigure_Json_PluginFile(LPCTSTR lpszConfigFile, XENGINE_PLUGINCONFIG* pSt_PluginConfig);

‎XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_File/ModuleConfigure_File.cpp‎

Lines changed: 0 additions & 105 deletions
This file was deleted.

‎XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_File/ModuleConfigure_File.h‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.def‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,4 @@ EXPORTS
55

66
ModuleConfigure_Json_File
77
ModuleConfigure_Json_OPenccFile
8-
ModuleConfigure_Json_PluginFile
9-
10-
ModuleConfigure_File_OPtion
8+
ModuleConfigure_Json_PluginFile

‎XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,13 @@
169169
</ItemDefinitionGroup>
170170
<ItemGroup>
171171
<ClInclude Include="framework.h" />
172-
<ClInclude Include="ModuleConfigure_File\ModuleConfigure_File.h" />
173172
<ClInclude Include="ModuleConfigure_Json\ModuleConfigure_Json.h" />
174173
<ClInclude Include="ModuleConfig_Define.h" />
175174
<ClInclude Include="ModuleConfig_Error.h" />
176175
<ClInclude Include="pch.h" />
177176
</ItemGroup>
178177
<ItemGroup>
179178
<ClCompile Include="dllmain.cpp" />
180-
<ClCompile Include="ModuleConfigure_File\ModuleConfigure_File.cpp" />
181179
<ClCompile Include="ModuleConfigure_Json\ModuleConfigure_Json.cpp" />
182180
<ClCompile Include="pch.cpp">
183181
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

‎XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj.filters‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@
1919
<Filter Include="源文件\ModuleConfigure_Json">
2020
<UniqueIdentifier>{865425d8-f7eb-4fb9-bcd1-8bb631209b4e}</UniqueIdentifier>
2121
</Filter>
22-
<Filter Include="头文件\ModuleConfigure_File">
23-
<UniqueIdentifier>{6976af83-32b2-4404-a20e-2f619e57daad}</UniqueIdentifier>
24-
</Filter>
25-
<Filter Include="源文件\ModuleConfigure_File">
26-
<UniqueIdentifier>{6b6efe12-6349-4581-a649-d81c086fb267}</UniqueIdentifier>
27-
</Filter>
2822
</ItemGroup>
2923
<ItemGroup>
3024
<ClInclude Include="framework.h">
@@ -42,9 +36,6 @@
4236
<ClInclude Include="ModuleConfig_Error.h">
4337
<Filter>头文件</Filter>
4438
</ClInclude>
45-
<ClInclude Include="ModuleConfigure_File\ModuleConfigure_File.h">
46-
<Filter>头文件\ModuleConfigure_File</Filter>
47-
</ClInclude>
4839
</ItemGroup>
4940
<ItemGroup>
5041
<ClCompile Include="dllmain.cpp">
@@ -56,9 +47,6 @@
5647
<ClCompile Include="ModuleConfigure_Json\ModuleConfigure_Json.cpp">
5748
<Filter>源文件\ModuleConfigure_Json</Filter>
5849
</ClCompile>
59-
<ClCompile Include="ModuleConfigure_File\ModuleConfigure_File.cpp">
60-
<Filter>源文件\ModuleConfigure_File</Filter>
61-
</ClCompile>
6250
</ItemGroup>
6351
<ItemGroup>
6452
<None Include="XEngine_ModuleConfigure.def">

‎XEngine_Source/XEngine_ModuleConfigure/pch.cpp‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "pch.h"
22
#include "ModuleConfigure_Json/ModuleConfigure_Json.h"
3-
#include "ModuleConfigure_File/ModuleConfigure_File.h"
43
/********************************************************************
54
// Created: 2021/12/02 16:20:26
65
// File Name: D:\XEngine_ServiceApp\XEngine_Source\XEngine_ModuleConfigure\pch.cpp
@@ -16,7 +15,6 @@ BOOL Config_IsErrorOccur = FALSE;
1615
DWORD Config_dwErrorCode = 0;
1716
//////////////////////////////////////////////////////////////////////
1817
CModuleConfigure_Json m_ConfigJson;
19-
CModuleConfigure_File m_ConfigFile;
2018
//////////////////////////////////////////////////////////////////////
2119
// 导出函数定义
2220
//////////////////////////////////////////////////////////////////////
@@ -42,11 +40,4 @@ extern "C" BOOL ModuleConfigure_Json_OPenccFile(LPCTSTR lpszConfigFile, XENGINE_
4240
extern "C" BOOL ModuleConfigure_Json_PluginFile(LPCTSTR lpszConfigFile, XENGINE_PLUGINCONFIG * pSt_PluginConfig)
4341
{
4442
return m_ConfigJson.ModuleConfigure_Json_PluginFile(lpszConfigFile, pSt_PluginConfig);
45-
}
46-
/************************************************************************/
47-
/* 其他内容读取 */
48-
/************************************************************************/
49-
extern "C" BOOL ModuleConfigure_File_OPtion(LPCTSTR lpszConfigFile, XENGINE_OPTIONLIST * pSt_OPtionList)
50-
{
51-
return m_ConfigFile.ModuleConfigure_File_OPtion(lpszConfigFile, pSt_OPtionList);
5243
}

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Configure.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ BOOL XEngine_Configure_Parament(int argc, char** argv, XENGINE_SERVICECONFIG* pS
1919
{
2020
printf("解析配置文件失败,ModuleConfigure_Json_File:%lX\n", ModuleConfigure_GetLastError());
2121
return FALSE;
22-
}
23-
if (!ModuleConfigure_File_OPtion(lpszOPtionFile, &st_OPtionList))
24-
{
25-
printf("解析配置文件失败,ModuleConfigure_File_OPtion:%lX\n", ModuleConfigure_GetLastError());
26-
return FALSE;
2722
}
2823

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

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Hdr.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ extern XENGINE_SERVICECONFIG st_ServiceConfig;
9292
extern XENGINE_OPENCCCONFIG st_OPenccConfig;
9393
extern XENGINE_PLUGINCONFIG st_PluginLibConfig;
9494
extern XENGINE_PLUGINCONFIG st_PluginLuaConfig;
95-
extern XENGINE_OPTIONLIST st_OPtionList;
9695
//连接库
9796
#ifdef _WINDOWS
9897
#ifdef _WIN64

0 commit comments

Comments
 (0)