update:ip database use geolite

Author: xengine-qyt

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -76,7 +76,8 @@
         "bEnable": true,
         "tszDBPhone": "./XEngine_DBFile/phone.xdb",
         "tszDBMac": "./XEngine_DBFile/macaddr.xdb",
-        "tszDBIPAddr": "./XEngine_DBFile/ip2region.xdb"
+        "tszDBIPAddr": "./XEngine_DBFile/GeoLite2-City.mmdb",
+        "tszDBISPAddr": "./XEngine_DBFile/GeoLite2-ASN.mmdb"
     },
     "XReport":{
         "bEnable":true,

XEngine_Release/XEngine_DBFile/keepfile

@@ -0,0 +1 @@
+keepfile

XEngine_Source/XEngine_DBDepend/XEngine_IPMacData

@@ -114,6 +114,7 @@ typedef struct
 		XCHAR tszDBPhone[MAX_PATH];
 		XCHAR tszDBMac[MAX_PATH];
 		XCHAR tszDBIPAddr[MAX_PATH];
+		XCHAR tszDBISPAddr[MAX_PATH];
 	}st_XAPIModule;
 	struct
 	{

XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h

@@ -216,7 +216,7 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 	pSt_ServerConfig->st_XVerifcation.st_VerSwitch.bBackService = st_JsonVerSwitch["bBackService"].asBool();
 	pSt_ServerConfig->st_XVerifcation.st_VerSwitch.bDeamon = st_JsonVerSwitch["bDeamon"].asBool();
 
-	if (st_JsonRoot["XAPIModule"].empty() || (4 != st_JsonRoot["XAPIModule"].size()))
+	if (st_JsonRoot["XAPIModule"].empty() || (5 != st_JsonRoot["XAPIModule"].size()))
 	{
 		Config_IsErrorOccur = true;
 		Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_XREPORT;
@@ -225,6 +225,7 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 	Json::Value st_JsonXAPIModule = st_JsonRoot["XAPIModule"];
 	pSt_ServerConfig->st_XAPIModule.bEnable = st_JsonXAPIModule["bEnable"].asBool();
 	_tcsxcpy(pSt_ServerConfig->st_XAPIModule.tszDBIPAddr, st_JsonXAPIModule["tszDBIPAddr"].asCString());
+	_tcsxcpy(pSt_ServerConfig->st_XAPIModule.tszDBISPAddr, st_JsonXAPIModule["tszDBISPAddr"].asCString());
 	_tcsxcpy(pSt_ServerConfig->st_XAPIModule.tszDBMac, st_JsonXAPIModule["tszDBMac"].asCString());
 	_tcsxcpy(pSt_ServerConfig->st_XAPIModule.tszDBPhone, st_JsonXAPIModule["tszDBPhone"].asCString());
 

XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp

@@ -1752,11 +1752,14 @@ bool CModuleProtocol_Packet::ModuleProtocol_Packet_IPAddr(XCHAR* ptszMSGBuffer,
 	Json::StreamWriterBuilder st_JsonBuilder;
 
 	st_JsonObject["tszIPAddr"] = pSt_IPAddrInfo->tszIPAddr;
-	st_JsonObject["tszIPCity"] = pSt_IPAddrInfo->tszIPCity;
+	st_JsonObject["tszIPContinent"] = pSt_IPAddrInfo->tszIPContinent;
 	st_JsonObject["tszIPCountry"] = pSt_IPAddrInfo->tszIPCountry;
-	st_JsonObject["tszIPCounty"] = pSt_IPAddrInfo->tszIPCounty;
-	st_JsonObject["tszIPISP"] = pSt_IPAddrInfo->tszIPISP;
 	st_JsonObject["tszIPProvince"] = pSt_IPAddrInfo->tszIPProvince;
+	st_JsonObject["tszIPCity"] = pSt_IPAddrInfo->tszIPCity;
+	st_JsonObject["tszIPISP"] = pSt_IPAddrInfo->tszIPISP;
+	st_JsonObject["tszTimezone"] = pSt_IPAddrInfo->tszTimezone;
+	st_JsonObject["dlLatitude"] = pSt_IPAddrInfo->dlLatitude;
+	st_JsonObject["dlLongitude"] = pSt_IPAddrInfo->dlLongitude;
 
 	st_JsonRoot["code"] = 0;
 	st_JsonRoot["msg"] = "success";

XEngine_Source/XEngine_ModuleProtocol/ModuleProtocol_Packet/ModuleProtocol_Packet.cpp

@@ -467,7 +467,7 @@ int main(int argc, char** argv)
 
 	if (st_ServiceConfig.st_XAPIModule.bEnable)
 	{
-		if (!APIModule_IPAddr_Init(st_ServiceConfig.st_XAPIModule.tszDBIPAddr))
+		if (!APIModule_IPAddr_Init(st_ServiceConfig.st_XAPIModule.tszDBIPAddr, st_ServiceConfig.st_XAPIModule.tszDBISPAddr))
 		{
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("启动服务中,启动IP地址数据查询服务:%s 失败，错误：%lX"), st_ServiceConfig.st_XAPIModule.tszDBIPAddr, APIIPMac_GetLastError());
 		}