Skip to content

Commit c9854b7

Browse files
xengine-qytxengine-qyt
committed
fixed:build error
1 parent 9e631e2 commit c9854b7

File tree

7 files changed

+119
-10
lines changed

7 files changed

+119
-10
lines changed

‎XEngine_Release/XEngine_Config/XEngine_OPtionConfig.json‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
{
2+
"OPTionBase": [{
3+
"OPTionEnable": true,
4+
"OPTionMethod": "ip",
5+
"OPTionNote": "IP地址信息查询",
6+
"OPTionExample": "http://%s/api?function=ip&params1=1.29.164.255&params2=0"
7+
},
8+
{
9+
"OPTionEnable": true,
10+
"OPTionMethod": "id",
11+
"OPTionNote": "身份证信息查询",
12+
"OPTionExample": "http://%s/api?function=id&params1=511025191101018792&params2=0"
13+
},
14+
{
15+
"OPTionEnable": true,
16+
"OPTionMethod": "phone",
17+
"OPTionNote": "电话号码查询",
18+
"OPTionExample": "http://%s/api?function=phone&params1=13699428888&params2=0"
19+
},
20+
{
21+
"OPTionEnable": true,
22+
"OPTionMethod": "bank",
23+
"OPTionNote": "银行卡验证",
24+
"OPTionExample": "http://%s/api?function=bank&params1=6214000000&params2=0"
25+
},
26+
{
27+
"OPTionEnable": true,
28+
"OPTionMethod": "language",
29+
"OPTionNote": "语言转换",
30+
"OPTionExample": "http://%s/api?function=language&params1=繁体到简体&params2=0&params3=1"
31+
},
32+
{
33+
"OPTionEnable": true,
34+
"OPTionMethod": "translation",
35+
"OPTionNote": "翻译",
36+
"OPTionExample": "http://%s/api?function=translation&params1=中国&params2=0&params3=0"
37+
},
38+
{
39+
"OPTionEnable": true,
40+
"OPTionMethod": "p2p",
41+
"OPTionNote": "p2p网络",
42+
"OPTionExample": "参考文档"
43+
}
44+
],
45+
"OPTionPlugin": [{
46+
"OPTionEnable": true,
47+
"OPTionMethod": "zodiac",
48+
"OPTionNote": "生肖星座",
49+
"OPTionExample": "http://%s/api?function=zodiac&params1=19880121"
50+
},
51+
{
52+
"OPTionEnable": true,
53+
"OPTionMethod": "pass",
54+
"OPTionNote": "密码",
55+
"OPTionExample": "http://%s/api?function=pass&params1=1&params2=4"
56+
},
57+
{
58+
"OPTionEnable": true,
59+
"OPTionMethod": "timezone",
60+
"OPTionNote": "时区转换",
61+
"OPTionExample": "http://%s/api?function=timezone&params1=0"
62+
},
63+
{
64+
"OPTionEnable": true,
65+
"OPTionMethod": "bmindex",
66+
"OPTionNote": "体脂标准",
67+
"OPTionExample": "http://%s/api?function=bmindex&params1=高(米))&param2=体重(千克)"
68+
}
69+
]
70+
}

‎XEngine_Source/Makefile‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,20 @@ MODULE_PLUGIN_PATH = ./XEngine_ModulePlugin
1414

1515
PLUGIN_MODULE_ZODIAC = ./XEngine_PluginModule/ModulePlugin_Zodiac
1616
PLUGIN_MODULE_PASSWORD = ./XEngine_PluginModule/ModulePlugin_Password
17+
PLUGIN_MODULE_TIMEZONE = ./XEngine_PluginModule/ModulePlugin_Timezone
18+
PLUGIN_MODULE_BMINDEX = ./XEngine_PluginModule/ModulePlugin_BMIndex
1719

1820
APP_CENTER_PATH = ./XEngine_ServiceApp/XEngine_CenterApp
1921
APP_HTTP_PATH = ./XEngine_ServiceApp/XEngine_HttpApp
2022

2123
XENGINE_MODULES = libjsoncpp.so \
2224
libXEngine_ModuleConfigure.so libXEngine_ModuleDatabase.so libXEngine_ModuleProtocol.so libXEngine_ModuleHelp.so libXEngine_ModulePlugin.so \
23-
libModulePlugin_Zodiac.so libModulePlugin_Password.so \
24-
XEngine_HttpApp.exe
25-
26-
ifeq ($(shell uname),Darwin)
27-
else
28-
XENGINE_MODULES += libopencc.so
29-
endif
25+
libModulePlugin_Zodiac.so libModulePlugin_Password.so libModulePlugin_Timezone.so libModulePlugin_BMIndex.so\
26+
XEngine_HttpApp.exe
3027

3128
.PHONY:MakeAll
3229
MakeAll:$(XENGINE_MODULES)
3330

34-
libopencc.so:
35-
cp -rf ./XEngine_ThirdPart/opencc/ubuntu/libopencc.so ../XEngine_Release/libopencc.so
3631
libjsoncpp.so:
3732
make -C $(THIRDPART_MODULE_JSONCPP) $(FLAGS)
3833

@@ -51,6 +46,10 @@ libModulePlugin_Zodiac.so:
5146
make -C $(PLUGIN_MODULE_ZODIAC) $(FLAGS)
5247
libModulePlugin_Password.so:
5348
make -C $(PLUGIN_MODULE_PASSWORD) $(FLAGS)
49+
libModulePlugin_Timezone.so:
50+
make -C $(PLUGIN_MODULE_TIMEZONE) $(FLAGS)
51+
libModulePlugin_BMIndex.so:
52+
make -C $(PLUGIN_MODULE_BMINDEX) $(FLAGS)
5453

5554
XEngine_HttpApp.exe:
5655
make -C $(APP_HTTP_PATH) $(FLAGS)

‎XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/pch.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <unordered_map>
2121
#include <json/json.h>
2222
#include <XEngine_Include/XEngine_CommHdr.h>
23+
#include <XEngine_Include/XEngine_Types.h>
2324
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
2425
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
2526
#include "BMIndex_Define.h"

‎XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/pch.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <unordered_map>
2121
#include <json/json.h>
2222
#include <XEngine_Include/XEngine_CommHdr.h>
23+
#include <XEngine_Include/XEngine_Types.h>
2324
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
2425
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
2526
#include "Timezone_Define.h"

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool
1010
LIBEX = -ldl -lpthread
1111
LOADSO = -Wl,-rpath=./,--disable-new-dtags
1212
LIBINCLUDE = XEngine_Configure.o XEngine_Network.o XEngine_HTTPTask.o XEngine_PluginTask.o XEngine_HttpApp.o \
13-
HTTPTask_IPInfo.o HTTPTask_IDCard.o HTTPTask_Phone.o HTTPTask_Bank.o HTTPTask_Language.o HTTPTask_Translation.o HTTPTask_P2PClient.o
13+
HTTPTask_IPInfo.o HTTPTask_IDCard.o HTTPTask_Phone.o HTTPTask_Bank.o HTTPTask_Language.o HTTPTask_Translation.o HTTPTask_P2PClient.o HTTPTask_OPtions.o
1414

1515
ifeq ($(shell uname),Darwin)
1616
LOADSO =
@@ -56,6 +56,8 @@ HTTPTask_Translation.o:./XEngine_HTTPTask/HTTPTask_Translation.cpp
5656
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./XEngine_HTTPTask/HTTPTask_Translation.cpp
5757
HTTPTask_P2PClient.o:./XEngine_HTTPTask/HTTPTask_P2PClient.cpp
5858
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./XEngine_HTTPTask/HTTPTask_P2PClient.cpp
59+
HTTPTask_OPtions.o:./XEngine_HTTPTask/HTTPTask_OPtions.cpp
60+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./XEngine_HTTPTask/HTTPTask_OPtions.cpp
5961

6062
XEngine_HttpApp.o:./XEngine_HttpApp.cpp
6163
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./XEngine_HttpApp.cpp

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HTTPTask/HTTPTask_OPtions.cpp‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#include "../XEngine_Hdr.h"
2+
3+
4+
BOOL XEngine_HTTPTask_OPTions(LPCTSTR lpszClientAddr)
5+
{
6+
int nMsgLen = 4096;
7+
int nPktLen = 4096;
8+
TCHAR tszMsgBuffer[4096];
9+
TCHAR tszPktBuffer[4096];
10+
RFCCOMPONENTS_HTTP_HDRPARAM st_HDRParam; //发送给客户端的参数
11+
12+
memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
13+
memset(tszPktBuffer, '\0', sizeof(tszPktBuffer));
14+
memset(&st_HDRParam, '\0', sizeof(RFCCOMPONENTS_HTTP_HDRPARAM));
15+
16+
st_HDRParam.nHttpCode = 200; //HTTP CODE码
17+
st_HDRParam.bIsClose = TRUE; //收到回复后就关闭
18+
//解析能力配置
19+
XENGINE_OPTIONLIST st_OPtionList;
20+
LPCTSTR lpszOPFile = _T("./XEngine_Config/XEngine_OPtionConfig.json");
21+
FILE* pSt_File = _tfopen(lpszOPFile, _T("rb"));
22+
if (NULL == pSt_File)
23+
{
24+
return FALSE;
25+
}
26+
nPktLen = fread(tszPktBuffer, 1, nPktLen, pSt_File);
27+
fclose(pSt_File);
28+
//打包发送
29+
RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszMsgBuffer, &nMsgLen, &st_HDRParam, tszPktBuffer, nPktLen);
30+
XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen);
31+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("HTTP客户端:%s,发送银行卡信息获取请求给服务器"), lpszClientAddr);
32+
return TRUE;
33+
}

‎XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HTTPTask/HTTPTask_OPtions.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#pragma once
2+
3+
BOOL XEngine_HTTPTask_OPTions(LPCTSTR lpszClientAddr);

0 commit comments

Comments
 (0)