From 46f44c6f2569984514f6dfd548fd6418ca3d2b47 Mon Sep 17 00:00:00 2001
From: qyt <486179@qq.com>
Date: Sun, 28 Apr 2024 15:06:40 +0800
Subject: [PATCH 01/24] fixed:image process ext name is incorrect
---
.../APPClient_ImageExample/APPClient_ImageExample.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/XEngine_APPClient/APPClient_ImageExample/APPClient_ImageExample.cpp b/XEngine_APPClient/APPClient_ImageExample/APPClient_ImageExample.cpp
index 0a453d6..2015c00 100644
--- a/XEngine_APPClient/APPClient_ImageExample/APPClient_ImageExample.cpp
+++ b/XEngine_APPClient/APPClient_ImageExample/APPClient_ImageExample.cpp
@@ -79,12 +79,14 @@ int test_imgzoom()
FILE* pSt_File = _xtfopen(pptszListFile[i], _X("rb"));
int nRet = (int)fread(ptszFileBuffer, 1, XENGINE_MEMORY_SIZE_MAX, pSt_File);
fclose(pSt_File);
+
APPClient_ImageExample_GetAttr(ptszFileBuffer, nRet, &nWidth, &nHeight);
- XCHAR tszAPIUrl[MAX_PATH];
- memset(tszAPIUrl, '\0', sizeof(tszAPIUrl));
+ XCHAR tszAPIUrl[MAX_PATH] = {};
+ XCHAR tszFileExt[64] = {};
- _xstprintf(tszAPIUrl, _X("http://127.0.0.1:5501/api?function=image&type=1&ext=png&width=%d&height=%d"), nWidth / 2, nHeight / 2);
+ BaseLib_OperatorString_GetFileAndPath(pptszListFile[i], NULL, NULL, NULL, tszFileExt);
+ _xstprintf(tszAPIUrl, _X("http://127.0.0.1:5501/api?function=image&type=1&ext=%s&width=%d&height=%d"), tszFileExt, nWidth / 2, nHeight / 2);
XCHAR* ptszMsgBuffer = NULL;
if (!APIClient_Http_Request(_X("POST"), tszAPIUrl, ptszFileBuffer, &nCode, &ptszMsgBuffer, &nRet))
--
Gitee
From acc8e3b5d88aa60ea9785edd3d07508372df9919 Mon Sep 17 00:00:00 2001
From: qyt <486179@qq.com>
Date: Mon, 29 Apr 2024 10:53:11 +0800
Subject: [PATCH 02/24] added:service name for machine
---
.../ModuleDatabase_Machine.cpp | 54 +++++++++++++++----
.../ModuleProtocol_Parse.cpp | 4 ++
XEngine_Source/XEngine_UserProtocol.h | 1 +
3 files changed, 48 insertions(+), 11 deletions(-)
diff --git a/XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_Machine/ModuleDatabase_Machine.cpp b/XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_Machine/ModuleDatabase_Machine.cpp
index 2de18b6..c080f89 100644
--- a/XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_Machine/ModuleDatabase_Machine.cpp
+++ b/XEngine_Source/XEngine_ModuleDatabase/ModuleDatabase_Machine/ModuleDatabase_Machine.cpp
@@ -95,7 +95,7 @@ bool CModuleDatabase_Machine::ModuleDatabase_Machine_Insert(XENGINE_MACHINEINFO*
XCHAR tszSQLStatement[4096];
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
- _xstprintf(tszSQLStatement, _X("INSERT INTO `XEngine_MachineList` (tszMachineName,tszMachineCode,tszMachineSystem,tszMachineText,nTimeNumber,tszCreateTime) VALUES('%s','%s','%s','%s',%lld,now())"), pSt_MachineInfo->tszMachineName, pSt_MachineInfo->tszMachineCode, pSt_MachineInfo->tszMachineSystem, pSt_MachineInfo->tszMachineText, pSt_MachineInfo->nTimeNumber);
+ _xstprintf(tszSQLStatement, _X("INSERT INTO `XEngine_MachineList` (tszServiceName,tszMachineName,tszMachineCode,tszMachineSystem,tszMachineText,nTimeNumber,tszCreateTime) VALUES('%s','%s','%s','%s','%s',%lld,now())"), pSt_MachineInfo->tszServiceName, pSt_MachineInfo->tszMachineName, pSt_MachineInfo->tszMachineCode, pSt_MachineInfo->tszMachineSystem, pSt_MachineInfo->tszMachineText, pSt_MachineInfo->nTimeNumber);
#ifdef _MSC_BUILD
XCHAR tszUTFStr[4096] = {};
int nSLen = _tcsxlen(tszSQLStatement);
@@ -142,7 +142,14 @@ bool CModuleDatabase_Machine::ModuleDatabase_Machine_Query(XENGINE_MACHINEINFO*
XCHAR tszSQLStatement[1024];
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
- _xstprintf(tszSQLStatement, _X("SELECT * FROM `XEngine_MachineList` WHERE tszMachineCode = '%s'"), pSt_MachineInfo->tszMachineCode);
+ if (_tcsxlen(pSt_MachineInfo->tszServiceName) > 0)
+ {
+ _xstprintf(tszSQLStatement, _X("SELECT * FROM `XEngine_MachineList` WHERE tszMachineCode = '%s' AND tszServiceName = '%s'"), pSt_MachineInfo->tszMachineCode, pSt_MachineInfo->tszServiceName);
+ }
+ else
+ {
+ _xstprintf(tszSQLStatement, _X("SELECT * FROM `XEngine_MachineList` WHERE tszMachineCode = '%s'"), pSt_MachineInfo->tszMachineCode);
+ }
if (!DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nllLine, &nllRow))
{
DBModule_IsErrorOccur = true;
@@ -219,11 +226,25 @@ bool CModuleDatabase_Machine::ModuleDatabase_Machine_Delete(XENGINE_MACHINEINFO*
if (_tcsxlen(pSt_MachineInfo->tszMachineCode) > 0)
{
- _xstprintf(tszSQLStatement, _X("DELETE FROM `XEngine_MachineList` WHERE tszMachineCode = '%s'"), pSt_MachineInfo->tszMachineCode);
+ if (_tcsxlen(pSt_MachineInfo->tszServiceName) > 0)
+ {
+ _xstprintf(tszSQLStatement, _X("DELETE FROM `XEngine_MachineList` WHERE tszMachineCode = '%s' AND tszServiceName = '%s'"), pSt_MachineInfo->tszMachineCode, pSt_MachineInfo->tszServiceName);
+ }
+ else
+ {
+ _xstprintf(tszSQLStatement, _X("DELETE FROM `XEngine_MachineList` WHERE tszMachineCode = '%s'"), pSt_MachineInfo->tszMachineCode);
+ }
}
else
{
- _xstprintf(tszSQLStatement, _X("DELETE FROM `XEngine_MachineList` WHERE tszMachineName = '%s'"), pSt_MachineInfo->tszMachineName);
+ if (_tcsxlen(pSt_MachineInfo->tszServiceName) > 0)
+ {
+ _xstprintf(tszSQLStatement, _X("DELETE FROM `XEngine_MachineList` WHERE tszMachineName = '%s' AND tszServiceName = '%s'"), pSt_MachineInfo->tszMachineName, pSt_MachineInfo->tszServiceName);
+ }
+ else
+ {
+ _xstprintf(tszSQLStatement, _X("DELETE FROM `XEngine_MachineList` WHERE tszMachineName = '%s'"), pSt_MachineInfo->tszMachineName);
+ }
}
if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
@@ -260,7 +281,14 @@ bool CModuleDatabase_Machine::ModuleDatabase_Machine_UPDate(XENGINE_MACHINEINFO*
XCHAR tszSQLStatement[1024];
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
- _xstprintf(tszSQLStatement, _X("UPDATE `XEngine_MachineList` SET nTimeNumber = %lld WHERE tszMachineCode = '%s'"), pSt_MachineInfo->nTimeNumber, pSt_MachineInfo->tszMachineCode);
+ if (_tcsxlen(pSt_MachineInfo->tszServiceName) > 0)
+ {
+ _xstprintf(tszSQLStatement, _X("UPDATE `XEngine_MachineList` SET nTimeNumber = %lld WHERE tszMachineCode = '%s' AND tszServiceName = '%s'"), pSt_MachineInfo->nTimeNumber, pSt_MachineInfo->tszMachineCode, pSt_MachineInfo->tszServiceName);
+ }
+ else
+ {
+ _xstprintf(tszSQLStatement, _X("UPDATE `XEngine_MachineList` SET nTimeNumber = %lld WHERE tszMachineCode = '%s'"), pSt_MachineInfo->nTimeNumber, pSt_MachineInfo->tszMachineCode);
+ }
if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
{
@@ -325,27 +353,31 @@ bool CModuleDatabase_Machine::ModuleDatabase_Machine_List(XENGINE_MACHINEINFO***
}
if (NULL != pptszResult[1])
{
- _tcsxcpy((*pppSt_MachineInfo)[i]->tszMachineName, pptszResult[1]);
+ _tcsxcpy((*pppSt_MachineInfo)[i]->tszServiceName, pptszResult[1]);
}
if (NULL != pptszResult[2])
{
- _tcsxcpy((*pppSt_MachineInfo)[i]->tszMachineCode, pptszResult[2]);
+ _tcsxcpy((*pppSt_MachineInfo)[i]->tszMachineName, pptszResult[2]);
}
if (NULL != pptszResult[3])
{
- _tcsxcpy((*pppSt_MachineInfo)[i]->tszMachineSystem, pptszResult[3]);
+ _tcsxcpy((*pppSt_MachineInfo)[i]->tszMachineCode, pptszResult[3]);
}
if (NULL != pptszResult[4])
{
- _tcsxcpy((*pppSt_MachineInfo)[i]->tszMachineText, pptszResult[4]);
+ _tcsxcpy((*pppSt_MachineInfo)[i]->tszMachineSystem, pptszResult[4]);
}
if (NULL != pptszResult[5])
{
- (*pppSt_MachineInfo)[i]->nTimeNumber = _ttxoll(pptszResult[5]);
+ _tcsxcpy((*pppSt_MachineInfo)[i]->tszMachineText, pptszResult[5]);
}
if (NULL != pptszResult[6])
{
- _tcsxcpy((*pppSt_MachineInfo)[i]->tszCreateTime, pptszResult[6]);
+ (*pppSt_MachineInfo)[i]->nTimeNumber = _ttxoll(pptszResult[6]);
+ }
+ if (NULL != pptszResult[7])
+ {
+ _tcsxcpy((*pppSt_MachineInfo)[i]->tszCreateTime, pptszResult[7]);
}
}
DataBase_MySQL_FreeResult(xhDBSQL, xhTable);
diff --git a/XEngine_Source/XEngine_ModuleProtocol/ModuleProtocol_Parse/ModuleProtocol_Parse.cpp b/XEngine_Source/XEngine_ModuleProtocol/ModuleProtocol_Parse/ModuleProtocol_Parse.cpp
index 8ab8ee1..451c3a6 100644
--- a/XEngine_Source/XEngine_ModuleProtocol/ModuleProtocol_Parse/ModuleProtocol_Parse.cpp
+++ b/XEngine_Source/XEngine_ModuleProtocol/ModuleProtocol_Parse/ModuleProtocol_Parse.cpp
@@ -1116,6 +1116,10 @@ bool CModuleProtocol_Parse::ModuleProtocol_Parse_Machine(LPCXSTR lpszMsgBuffer,
return false;
}
+ if (!st_JsonRoot["tszServiceName"].isNull())
+ {
+ _tcsxcpy(pSt_MachineInfo->tszServiceName, st_JsonRoot["tszServiceName"].asCString());
+ }
if (!st_JsonRoot["tszMachineName"].isNull())
{
_tcsxcpy(pSt_MachineInfo->tszMachineName, st_JsonRoot["tszMachineName"].asCString());
diff --git a/XEngine_Source/XEngine_UserProtocol.h b/XEngine_Source/XEngine_UserProtocol.h
index fd4dc56..61bfebe 100644
--- a/XEngine_Source/XEngine_UserProtocol.h
+++ b/XEngine_Source/XEngine_UserProtocol.h
@@ -233,6 +233,7 @@ typedef struct
typedef struct
{
XCHAR tszMachineText[2048];
+ XCHAR tszServiceName[MAX_PATH];
XCHAR tszMachineName[MAX_PATH];
XCHAR tszMachineCode[MAX_PATH];
XCHAR tszMachineSystem[MAX_PATH];
--
Gitee
From b595ce0ce080224c930c55736ac69563d14ae396 Mon Sep 17 00:00:00 2001
From: qyt <486179@qq.com>
Date: Mon, 29 Apr 2024 10:53:38 +0800
Subject: [PATCH 03/24] update:machine sql
---
XEngine_SQL/XEngine_APIMachine.sql | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/XEngine_SQL/XEngine_APIMachine.sql b/XEngine_SQL/XEngine_APIMachine.sql
index fbd30c9..ab94f25 100644
--- a/XEngine_SQL/XEngine_APIMachine.sql
+++ b/XEngine_SQL/XEngine_APIMachine.sql
@@ -1,17 +1,17 @@
/*
Navicat Premium Data Transfer
- Source Server : mysql
+ Source Server : QCloud
Source Server Type : MySQL
Source Server Version : 80036 (8.0.36-0ubuntu0.22.04.1)
- Source Host : 10.0.3.154:3306
+ Source Host : 43.139.170.67:3306
Source Schema : XEngine_APIMachine
Target Server Type : MySQL
Target Server Version : 80036 (8.0.36-0ubuntu0.22.04.1)
File Encoding : 65001
- Date: 07/04/2024 14:19:54
+ Date: 29/04/2024 10:51:26
*/
SET NAMES utf8mb4;
@@ -23,6 +23,7 @@ SET FOREIGN_KEY_CHECKS = 0;
DROP TABLE IF EXISTS `XEngine_MachineList`;
CREATE TABLE `XEngine_MachineList` (
`ID` int NOT NULL AUTO_INCREMENT COMMENT 'ID',
+ `tszServiceName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '服务名称',
`tszMachineName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '机器名称',
`tszMachineCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '机器序列',
`tszMachineSystem` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '系统名称',
@@ -30,6 +31,6 @@ CREATE TABLE `XEngine_MachineList` (
`nTimeNumber` bigint NOT NULL COMMENT '启动次数',
`tszCreateTime` datetime NOT NULL COMMENT '注册时间',
PRIMARY KEY (`ID`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = DYNAMIC;
SET FOREIGN_KEY_CHECKS = 1;
--
Gitee
From 4ce238ad91a757ffc3c47a0d8466b5e55ec0f754 Mon Sep 17 00:00:00 2001
From: qyt <486179@qq.com>
Date: Tue, 30 Apr 2024 16:38:56 +0800
Subject: [PATCH 04/24] modify:jsoncpp is depend sub module
---
.gitmodules | 3 +
XEngine_Source/Makefile | 2 +-
XEngine_Source/XEngine.sln | 84 +-
XEngine_Source/XEngine_Depend | 1 +
.../XEngine_ModuleConfigure/Makefile | 4 +-
.../XEngine_ModuleConfigure.vcxproj | 2 +-
.../XEngine_ModuleProtocol/Makefile | 4 +-
.../XEngine_ModuleProtocol.vcxproj | 2 +-
.../ModulePlugin_BMIndex/Makefile | 4 +-
.../ModulePlugin_BMIndex.vcxproj | 2 +-
.../ModulePlugin_IPAddr/Makefile | 4 +-
.../ModulePlugin_IPAddr.vcxproj | 2 +-
.../ModulePlugin_Meter/Makefile | 4 +-
.../ModulePlugin_Meter.vcxproj | 2 +-
.../ModulePlugin_Password/Makefile | 4 +-
.../ModulePlugin_Password.vcxproj | 2 +-
.../ModulePlugin_Phone/Makefile | 4 +-
.../ModulePlugin_Phone.vcxproj | 2 +-
.../ModulePlugin_Timezone/Makefile | 4 +-
.../ModulePlugin_Timezone.vcxproj | 2 +-
.../ModulePlugin_Zodiac/Makefile | 4 +-
.../ModulePlugin_Zodiac.vcxproj | 2 +-
.../XEngine_HttpApp/Makefile | 4 +-
.../XEngine_ThirdPart/jsoncpp/Makefile | 71 -
.../jsoncpp/json/allocator.h | 88 -
.../jsoncpp/json/assertions.h | 61 -
.../XEngine_ThirdPart/jsoncpp/json/config.h | 150 --
.../XEngine_ThirdPart/jsoncpp/json/forwards.h | 43 -
.../XEngine_ThirdPart/jsoncpp/json/json.h | 15 -
.../jsoncpp/json/json_features.h | 61 -
.../XEngine_ThirdPart/jsoncpp/json/reader.h | 405 ----
.../XEngine_ThirdPart/jsoncpp/json/value.h | 935 --------
.../XEngine_ThirdPart/jsoncpp/json/version.h | 28 -
.../XEngine_ThirdPart/jsoncpp/json/writer.h | 369 ---
.../XEngine_ThirdPart/jsoncpp/json_reader.cpp | 1992 -----------------
.../XEngine_ThirdPart/jsoncpp/json_tool.h | 138 --
.../XEngine_ThirdPart/jsoncpp/json_value.cpp | 1634 --------------
.../jsoncpp/json_valueiterator.inl | 156 --
.../XEngine_ThirdPart/jsoncpp/json_writer.cpp | 1259 -----------
.../XEngine_ThirdPart/jsoncpp/jsoncpp.vcxproj | 177 --
.../jsoncpp/jsoncpp.vcxproj.filters | 63 -
.../jsoncpp/jsoncpp.vcxproj.user | 4 -
42 files changed, 105 insertions(+), 7692 deletions(-)
create mode 100644 .gitmodules
create mode 160000 XEngine_Source/XEngine_Depend
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/Makefile
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/json/allocator.h
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/json/assertions.h
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/json/config.h
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/json/forwards.h
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/json/json.h
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/json/json_features.h
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/json/reader.h
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/json/value.h
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/json/version.h
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/json/writer.h
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/json_reader.cpp
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/json_tool.h
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/json_value.cpp
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/json_valueiterator.inl
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/json_writer.cpp
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/jsoncpp.vcxproj
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/jsoncpp.vcxproj.filters
delete mode 100644 XEngine_Source/XEngine_ThirdPart/jsoncpp/jsoncpp.vcxproj.user
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..1cc1974
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "XEngine_Source/XEngine_Depend"]
+ path = XEngine_Source/XEngine_Depend
+ url = https://github.com/libxengine/XEngine_OPenSource.git
diff --git a/XEngine_Source/Makefile b/XEngine_Source/Makefile
index a9e2bff..ecba64a 100644
--- a/XEngine_Source/Makefile
+++ b/XEngine_Source/Makefile
@@ -4,7 +4,7 @@ PLATFORM=linux
FLAGS=
#要编译的模块
-THIRDPART_MODULE_JSONCPP = ./XEngine_ThirdPart/jsoncpp
+THIRDPART_MODULE_JSONCPP = ./XEngine_Depend/XEngine_Module/jsoncpp
MODULE_CONFIGURE_PATH = ./XEngine_ModuleConfigure
MODULE_DATABASE_PATH = ./XEngine_ModuleDatabase
diff --git a/XEngine_Source/XEngine.sln b/XEngine_Source/XEngine.sln
index 8a3ed84..1702a83 100644
--- a/XEngine_Source/XEngine.sln
+++ b/XEngine_Source/XEngine.sln
@@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
VisualStudioVersion = 17.1.32210.238
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_ModuleConfigure", "XEngine_ModuleConfigure\XEngine_ModuleConfigure.vcxproj", "{F54F152C-594F-4465-A44E-2DB915B39760}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81DD7437-D986-4C9E-848C-589856FACEBD} = {81DD7437-D986-4C9E-848C-589856FACEBD}
+ EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XEngine_UserHdr", "XEngine_UserHdr", "{9E4F2158-9AC1-4C19-A3F7-375A9DBCF856}"
ProjectSection(SolutionItems) = preProject
@@ -14,14 +17,30 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XEngine_ServiceApp", "XEngine_ServiceApp", "{79A9A569-7DA8-4D9D-AD34-D11115199EA1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_HttpApp", "XEngine_ServiceApp\XEngine_HttpApp\XEngine_HttpApp.vcxproj", "{E756B7D2-D40D-4106-9C14-1D90F20A712E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XEngine_ThirdPart", "XEngine_ThirdPart", "{1F64BA84-8754-4FD3-87F8-9102F124EBC1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsoncpp", "XEngine_ThirdPart\jsoncpp\jsoncpp.vcxproj", "{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}"
+ ProjectSection(ProjectDependencies) = postProject
+ {140AD4A9-4918-4345-B352-507C345AEBE0} = {140AD4A9-4918-4345-B352-507C345AEBE0}
+ {201B6D13-82A7-49E9-9736-D6B3BFE05B30} = {201B6D13-82A7-49E9-9736-D6B3BFE05B30}
+ {32BB166A-3D3D-45EF-8BED-2E0471274159} = {32BB166A-3D3D-45EF-8BED-2E0471274159}
+ {37B8E91F-EC52-41F0-B21D-441D4270C05F} = {37B8E91F-EC52-41F0-B21D-441D4270C05F}
+ {6C935BE1-77E3-4719-A7A6-C76ABAFEE010} = {6C935BE1-77E3-4719-A7A6-C76ABAFEE010}
+ {6D0FCB40-D544-4AB2-A239-2FEBC4B98F6D} = {6D0FCB40-D544-4AB2-A239-2FEBC4B98F6D}
+ {6F111577-DAF8-4294-B516-0077C22D7613} = {6F111577-DAF8-4294-B516-0077C22D7613}
+ {81DD7437-D986-4C9E-848C-589856FACEBD} = {81DD7437-D986-4C9E-848C-589856FACEBD}
+ {8FBC495D-C05E-49A4-B938-A81C9DFC1E5A} = {8FBC495D-C05E-49A4-B938-A81C9DFC1E5A}
+ {92F971AB-CAC9-4D9B-A9CA-AFD9CA17E505} = {92F971AB-CAC9-4D9B-A9CA-AFD9CA17E505}
+ {BBC4B2B4-1143-45DF-8890-47CE26A61D0E} = {BBC4B2B4-1143-45DF-8890-47CE26A61D0E}
+ {CB443280-E283-44CD-B956-52C404A51DB6} = {CB443280-E283-44CD-B956-52C404A51DB6}
+ {D549160C-CC16-47F8-8345-1F4CF7A25CA2} = {D549160C-CC16-47F8-8345-1F4CF7A25CA2}
+ {F54F152C-594F-4465-A44E-2DB915B39760} = {F54F152C-594F-4465-A44E-2DB915B39760}
+ {F6520D2C-BB8E-45BB-964B-F5D6A4318A89} = {F6520D2C-BB8E-45BB-964B-F5D6A4318A89}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_ModuleDatabase", "XEngine_ModuleDatabase\XEngine_ModuleDatabase.vcxproj", "{140AD4A9-4918-4345-B352-507C345AEBE0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_ModuleProtocol", "XEngine_ModuleProtocol\XEngine_ModuleProtocol.vcxproj", "{6C935BE1-77E3-4719-A7A6-C76ABAFEE010}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81DD7437-D986-4C9E-848C-589856FACEBD} = {81DD7437-D986-4C9E-848C-589856FACEBD}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_ModuleHelp", "XEngine_ModuleHelp\XEngine_ModuleHelp.vcxproj", "{6D0FCB40-D544-4AB2-A239-2FEBC4B98F6D}"
EndProject
@@ -30,21 +49,51 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XEngine_PluginModule", "XEngine_PluginModule", "{D0473C03-9464-4C44-818A-AE212680CD05}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libModulePlugin_Zodiac", "XEngine_PluginModule\ModulePlugin_Zodiac\ModulePlugin_Zodiac.vcxproj", "{32BB166A-3D3D-45EF-8BED-2E0471274159}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81DD7437-D986-4C9E-848C-589856FACEBD} = {81DD7437-D986-4C9E-848C-589856FACEBD}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libModulePlugin_Password", "XEngine_PluginModule\ModulePlugin_Password\ModulePlugin_Password.vcxproj", "{201B6D13-82A7-49E9-9736-D6B3BFE05B30}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81DD7437-D986-4C9E-848C-589856FACEBD} = {81DD7437-D986-4C9E-848C-589856FACEBD}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libModulePlugin_Timezone", "XEngine_PluginModule\ModulePlugin_Timezone\ModulePlugin_Timezone.vcxproj", "{37B8E91F-EC52-41F0-B21D-441D4270C05F}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81DD7437-D986-4C9E-848C-589856FACEBD} = {81DD7437-D986-4C9E-848C-589856FACEBD}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libModulePlugin_BMIndex", "XEngine_PluginModule\ModulePlugin_BMIndex\ModulePlugin_BMIndex.vcxproj", "{BBC4B2B4-1143-45DF-8890-47CE26A61D0E}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81DD7437-D986-4C9E-848C-589856FACEBD} = {81DD7437-D986-4C9E-848C-589856FACEBD}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libModulePlugin_Meter", "XEngine_PluginModule\ModulePlugin_Meter\ModulePlugin_Meter.vcxproj", "{6F111577-DAF8-4294-B516-0077C22D7613}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81DD7437-D986-4C9E-848C-589856FACEBD} = {81DD7437-D986-4C9E-848C-589856FACEBD}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libModulePlugin_Phone", "XEngine_PluginModule\ModulePlugin_Phone\ModulePlugin_Phone.vcxproj", "{8FBC495D-C05E-49A4-B938-A81C9DFC1E5A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81DD7437-D986-4C9E-848C-589856FACEBD} = {81DD7437-D986-4C9E-848C-589856FACEBD}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libModulePlugin_IPAddr", "XEngine_PluginModule\ModulePlugin_IPAddr\ModulePlugin_IPAddr.vcxproj", "{D549160C-CC16-47F8-8345-1F4CF7A25CA2}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81DD7437-D986-4C9E-848C-589856FACEBD} = {81DD7437-D986-4C9E-848C-589856FACEBD}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_ModuleSystem", "XEngine_ModuleSystem\XEngine_ModuleSystem.vcxproj", "{92F971AB-CAC9-4D9B-A9CA-AFD9CA17E505}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XEngine_Depend", "XEngine_Depend", "{2B89A3C7-0CC8-4881-B195-61BAA9ACB78B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsoncpp", "XEngine_Depend\XEngine_Module\jsoncpp\jsoncpp.vcxproj", "{81DD7437-D986-4C9E-848C-589856FACEBD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_InfoReport", "XEngine_Depend\XEngine_Module\XEngine_InfoReport\XEngine_InfoReport.vcxproj", "{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81DD7437-D986-4C9E-848C-589856FACEBD} = {81DD7437-D986-4C9E-848C-589856FACEBD}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -69,14 +118,6 @@ Global
{E756B7D2-D40D-4106-9C14-1D90F20A712E}.Release|x64.Build.0 = Release|x64
{E756B7D2-D40D-4106-9C14-1D90F20A712E}.Release|x86.ActiveCfg = Release|Win32
{E756B7D2-D40D-4106-9C14-1D90F20A712E}.Release|x86.Build.0 = Release|Win32
- {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Debug|x64.ActiveCfg = Debug|x64
- {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Debug|x64.Build.0 = Debug|x64
- {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Debug|x86.ActiveCfg = Debug|Win32
- {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Debug|x86.Build.0 = Debug|Win32
- {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Release|x64.ActiveCfg = Release|x64
- {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Release|x64.Build.0 = Release|x64
- {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Release|x86.ActiveCfg = Release|Win32
- {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Release|x86.Build.0 = Release|Win32
{140AD4A9-4918-4345-B352-507C345AEBE0}.Debug|x64.ActiveCfg = Debug|x64
{140AD4A9-4918-4345-B352-507C345AEBE0}.Debug|x64.Build.0 = Debug|x64
{140AD4A9-4918-4345-B352-507C345AEBE0}.Debug|x86.ActiveCfg = Debug|Win32
@@ -173,13 +214,28 @@ Global
{92F971AB-CAC9-4D9B-A9CA-AFD9CA17E505}.Release|x64.Build.0 = Release|x64
{92F971AB-CAC9-4D9B-A9CA-AFD9CA17E505}.Release|x86.ActiveCfg = Release|Win32
{92F971AB-CAC9-4D9B-A9CA-AFD9CA17E505}.Release|x86.Build.0 = Release|Win32
+ {81DD7437-D986-4C9E-848C-589856FACEBD}.Debug|x64.ActiveCfg = Debug|x64
+ {81DD7437-D986-4C9E-848C-589856FACEBD}.Debug|x64.Build.0 = Debug|x64
+ {81DD7437-D986-4C9E-848C-589856FACEBD}.Debug|x86.ActiveCfg = Debug|Win32
+ {81DD7437-D986-4C9E-848C-589856FACEBD}.Debug|x86.Build.0 = Debug|Win32
+ {81DD7437-D986-4C9E-848C-589856FACEBD}.Release|x64.ActiveCfg = Release|x64
+ {81DD7437-D986-4C9E-848C-589856FACEBD}.Release|x64.Build.0 = Release|x64
+ {81DD7437-D986-4C9E-848C-589856FACEBD}.Release|x86.ActiveCfg = Release|Win32
+ {81DD7437-D986-4C9E-848C-589856FACEBD}.Release|x86.Build.0 = Release|Win32
+ {F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Debug|x64.ActiveCfg = Debug|x64
+ {F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Debug|x64.Build.0 = Debug|x64
+ {F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Debug|x86.ActiveCfg = Debug|Win32
+ {F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Debug|x86.Build.0 = Debug|Win32
+ {F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Release|x64.ActiveCfg = Release|x64
+ {F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Release|x64.Build.0 = Release|x64
+ {F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Release|x86.ActiveCfg = Release|Win32
+ {F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{E756B7D2-D40D-4106-9C14-1D90F20A712E} = {79A9A569-7DA8-4D9D-AD34-D11115199EA1}
- {F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {1F64BA84-8754-4FD3-87F8-9102F124EBC1}
{32BB166A-3D3D-45EF-8BED-2E0471274159} = {D0473C03-9464-4C44-818A-AE212680CD05}
{201B6D13-82A7-49E9-9736-D6B3BFE05B30} = {D0473C03-9464-4C44-818A-AE212680CD05}
{37B8E91F-EC52-41F0-B21D-441D4270C05F} = {D0473C03-9464-4C44-818A-AE212680CD05}
@@ -187,6 +243,8 @@ Global
{6F111577-DAF8-4294-B516-0077C22D7613} = {D0473C03-9464-4C44-818A-AE212680CD05}
{8FBC495D-C05E-49A4-B938-A81C9DFC1E5A} = {D0473C03-9464-4C44-818A-AE212680CD05}
{D549160C-CC16-47F8-8345-1F4CF7A25CA2} = {D0473C03-9464-4C44-818A-AE212680CD05}
+ {81DD7437-D986-4C9E-848C-589856FACEBD} = {2B89A3C7-0CC8-4881-B195-61BAA9ACB78B}
+ {F6520D2C-BB8E-45BB-964B-F5D6A4318A89} = {2B89A3C7-0CC8-4881-B195-61BAA9ACB78B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9B202F91-A601-429E-BB0F-880DDEE096FE}
diff --git a/XEngine_Source/XEngine_Depend b/XEngine_Source/XEngine_Depend
new file mode 160000
index 0000000..eff2078
--- /dev/null
+++ b/XEngine_Source/XEngine_Depend
@@ -0,0 +1 @@
+Subproject commit eff207853feeb6b9adf6fb282e456a44ff50242e
diff --git a/XEngine_Source/XEngine_ModuleConfigure/Makefile b/XEngine_Source/XEngine_ModuleConfigure/Makefile
index 1584487..5cd309e 100644
--- a/XEngine_Source/XEngine_ModuleConfigure/Makefile
+++ b/XEngine_Source/XEngine_ModuleConfigure/Makefile
@@ -6,8 +6,8 @@ FILEEXT =
LIBFLAG =
RELEASE = 0
UNICODE = 0
-LOADHDR = -I ./ -I ../XEngine_ThirdPart/jsoncpp
-LOADSO = -L ../XEngine_ThirdPart/jsoncpp
+LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
+LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
LIB = -ljsoncpp
LIBEX =
OBJECTS = ModuleConfigure_Json.o pch.o
diff --git a/XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj b/XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj
index 2f05479..bb6fa3a 100644
--- a/XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj
+++ b/XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj
@@ -72,7 +72,7 @@
true
- $(XEngine_Include);../XEngine_ThirdPart/jsoncpp;$(IncludePath)
+ $(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)
$(XEngine_Lib32);$(LibraryPath)
diff --git a/XEngine_Source/XEngine_ModuleProtocol/Makefile b/XEngine_Source/XEngine_ModuleProtocol/Makefile
index b492891..3a15f45 100644
--- a/XEngine_Source/XEngine_ModuleProtocol/Makefile
+++ b/XEngine_Source/XEngine_ModuleProtocol/Makefile
@@ -6,8 +6,8 @@ FILEEXT =
LIBFLAG =
RELEASE = 0
UNICODE = 0
-LOADHDR = -I ./ -I ../XEngine_ThirdPart/jsoncpp
-LOADSO = -L ../XEngine_ThirdPart/jsoncpp
+LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
+LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
LIB = -lXEngine_BaseLib -lNetHelp_XSocket -ljsoncpp
LIBEX =
OBJECTS = ModuleProtocol_Packet.o ModuleProtocol_Parse.o pch.o
diff --git a/XEngine_Source/XEngine_ModuleProtocol/XEngine_ModuleProtocol.vcxproj b/XEngine_Source/XEngine_ModuleProtocol/XEngine_ModuleProtocol.vcxproj
index 5fb7e2f..63bf890 100644
--- a/XEngine_Source/XEngine_ModuleProtocol/XEngine_ModuleProtocol.vcxproj
+++ b/XEngine_Source/XEngine_ModuleProtocol/XEngine_ModuleProtocol.vcxproj
@@ -72,7 +72,7 @@
true
- $(XEngine_Include);../XEngine_ThirdPart/jsoncpp;$(IncludePath)
+ $(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)
$(XEngine_Lib32);$(LibraryPath)
diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/Makefile b/XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/Makefile
index 11613aa..ffff591 100644
--- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/Makefile
+++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/Makefile
@@ -6,8 +6,8 @@ FILEEXT =
LIBFLAG =
RELEASE = 0
UNICODE = 0
-LOADHDR = -I ./ -I ../../XEngine_ThirdPart/jsoncpp
-LOADSO = -L ../../XEngine_ThirdPart/jsoncpp
+LOADHDR = -I ./ -I ../../XEngine_Depend/XEngine_Module/jsoncpp
+LOADSO = -L ../../XEngine_Depend/XEngine_Module/jsoncpp
LIB = -lXEngine_BaseLib -ljsoncpp
LIBEX =
OBJECTS = Plugin_BMIndex.o pch.o
diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/ModulePlugin_BMIndex.vcxproj b/XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/ModulePlugin_BMIndex.vcxproj
index 5a26533..d9c3c4b 100644
--- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/ModulePlugin_BMIndex.vcxproj
+++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_BMIndex/ModulePlugin_BMIndex.vcxproj
@@ -73,7 +73,7 @@
$(SolutionDir)$(Configuration)\XEngine_LibPlugin\
- ../../XEngine_ThirdPart/jsoncpp;$(XEngine_Include);$(IncludePath)
+ ../../XEngine_Depend/XEngine_Module/jsoncpp;$(XEngine_Include);$(IncludePath)
$(XEngine_Lib32);$(LibraryPath)
$(Configuration)\XEngine_LibPlugin\
$(ProjectName)
diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_IPAddr/Makefile b/XEngine_Source/XEngine_PluginModule/ModulePlugin_IPAddr/Makefile
index 4a08ae0..98e7136 100644
--- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_IPAddr/Makefile
+++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_IPAddr/Makefile
@@ -6,8 +6,8 @@ FILEEXT =
LIBFLAG =
RELEASE = 0
UNICODE = 0
-LOADHDR = -I ./ -I ../../XEngine_ThirdPart/jsoncpp
-LOADSO = -L ../../XEngine_ThirdPart/jsoncpp
+LOADHDR = -I ./ -I ../../XEngine_Depend/XEngine_Module/jsoncpp
+LOADSO = -L ../../XEngine_Depend/XEngine_Module/jsoncpp
LIB = -lXEngine_BaseLib -ljsoncpp
LIBEX =
OBJECTS = ModulePlugin_IPAddr.o ModulePlugin_Interface.o pch.o
diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_IPAddr/ModulePlugin_IPAddr.vcxproj b/XEngine_Source/XEngine_PluginModule/ModulePlugin_IPAddr/ModulePlugin_IPAddr.vcxproj
index e79494b..3755818 100644
--- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_IPAddr/ModulePlugin_IPAddr.vcxproj
+++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_IPAddr/ModulePlugin_IPAddr.vcxproj
@@ -72,7 +72,7 @@
- $(XEngine_Include);../../XEngine_ThirdPart/jsoncpp;$(IncludePath)
+ $(XEngine_Include);../../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)
$(XEngine_Lib32);$(LibraryPath)
$(SolutionDir)$(Configuration)\XEngine_LibPlugin\
$(Configuration)\XEngine_LibPlugin\
diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/Makefile b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/Makefile
index fe14c33..309d71a 100644
--- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/Makefile
+++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/Makefile
@@ -6,8 +6,8 @@ FILEEXT =
LIBFLAG =
RELEASE = 0
UNICODE = 0
-LOADHDR = -I ./ -I ../../XEngine_ThirdPart/jsoncpp
-LOADSO = -L ../../XEngine_ThirdPart/jsoncpp
+LOADHDR = -I ./ -I ../../XEngine_Depend/XEngine_Module/jsoncpp
+LOADSO = -L ../../XEngine_Depend/XEngine_Module/jsoncpp
LIB = -lXEngine_BaseLib -ljsoncpp
LIBEX =
OBJECTS = Plugin_Meter.o pch.o
diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/ModulePlugin_Meter.vcxproj b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/ModulePlugin_Meter.vcxproj
index f5f2394..54d449c 100644
--- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/ModulePlugin_Meter.vcxproj
+++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Meter/ModulePlugin_Meter.vcxproj
@@ -74,7 +74,7 @@
$(SolutionDir)$(Configuration)\XEngine_LibPlugin\
$(Configuration)\XEngine_LibPlugin\
- $(XEngine_Include);../../XEngine_ThirdPart/jsoncpp;$(IncludePath)
+ $(XEngine_Include);../../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)
$(XEngine_Lib32);$(LibraryPath)
diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/Makefile b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/Makefile
index 55d72fa..82c89bb 100644
--- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/Makefile
+++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/Makefile
@@ -6,8 +6,8 @@ FILEEXT =
LIBFLAG =
RELEASE = 0
UNICODE = 0
-LOADHDR = -I ./ -I ../../XEngine_ThirdPart/jsoncpp
-LOADSO = -L ../../XEngine_ThirdPart/jsoncpp
+LOADHDR = -I ./ -I ../../XEngine_Depend/XEngine_Module/jsoncpp
+LOADSO = -L ../../XEngine_Depend/XEngine_Module/jsoncpp
LIB = -lXEngine_BaseLib -ljsoncpp
LIBEX =
OBJECTS = Plugin_Password.o pch.o
diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/ModulePlugin_Password.vcxproj b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/ModulePlugin_Password.vcxproj
index f3effd5..704319b 100644
--- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/ModulePlugin_Password.vcxproj
+++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Password/ModulePlugin_Password.vcxproj
@@ -74,7 +74,7 @@
true
$(SolutionDir)$(Configuration)\XEngine_LibPlugin\
- $(XEngine_Include);../../XEngine_ThirdPart/jsoncpp;$(IncludePath)
+ $(XEngine_Include);../../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)
$(XEngine_Lib32);$(LibraryPath)
$(Configuration)\XEngine_LibPlugin\
diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Phone/Makefile b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Phone/Makefile
index 485283f..e7c2e6e 100644
--- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Phone/Makefile
+++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Phone/Makefile
@@ -6,8 +6,8 @@ FILEEXT =
LIBFLAG =
RELEASE = 0
UNICODE = 0
-LOADHDR = -I ./ -I ../../XEngine_ThirdPart/jsoncpp
-LOADSO = -L ../../XEngine_ThirdPart/jsoncpp
+LOADHDR = -I ./ -I ../../XEngine_Depend/XEngine_Module/jsoncpp
+LOADSO = -L ../../XEngine_Depend/XEngine_Module/jsoncpp
LIB = -lXEngine_BaseLib -ljsoncpp
LIBEX =
OBJECTS = ModulePlugin_DBPhone.o ModulePlugin_APIPhone.o pch.o
diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Phone/ModulePlugin_Phone.vcxproj b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Phone/ModulePlugin_Phone.vcxproj
index 8918a35..7caf3a0 100644
--- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Phone/ModulePlugin_Phone.vcxproj
+++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Phone/ModulePlugin_Phone.vcxproj
@@ -72,7 +72,7 @@
- $(XEngine_Include);../../XEngine_ThirdPart/jsoncpp;$(IncludePath)
+ $(XEngine_Include);../../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)
$(XEngine_Lib32);$(LibraryPath)
$(SolutionDir)$(Configuration)\XEngine_LibPlugin\
$(Configuration)\XEngine_LibPlugin\
diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/Makefile b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/Makefile
index 448677d..d6369d4 100644
--- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/Makefile
+++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/Makefile
@@ -6,8 +6,8 @@ FILEEXT =
LIBFLAG =
RELEASE = 0
UNICODE = 0
-LOADHDR = -I ./ -I ../../XEngine_ThirdPart/jsoncpp
-LOADSO = -L ../../XEngine_ThirdPart/jsoncpp
+LOADHDR = -I ./ -I ../../XEngine_Depend/XEngine_Module/jsoncpp
+LOADSO = -L ../../XEngine_Depend/XEngine_Module/jsoncpp
LIB = -lXEngine_BaseLib -ljsoncpp
LIBEX =
OBJECTS = Plugin_Timezone.o pch.o
diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/ModulePlugin_Timezone.vcxproj b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/ModulePlugin_Timezone.vcxproj
index 4e27953..3fd15e4 100644
--- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/ModulePlugin_Timezone.vcxproj
+++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Timezone/ModulePlugin_Timezone.vcxproj
@@ -72,7 +72,7 @@
- $(XEngine_Include);../../XEngine_ThirdPart/jsoncpp;$(IncludePath)
+ $(XEngine_Include);../../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)
$(XEngine_Lib32);$(LibraryPath)
$(SolutionDir)$(Configuration)\XEngine_LibPlugin\
$(Configuration)\XEngine_LibPlugin\
diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Zodiac/Makefile b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Zodiac/Makefile
index 1c9a66b..b224754 100644
--- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Zodiac/Makefile
+++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Zodiac/Makefile
@@ -6,8 +6,8 @@ FILEEXT =
LIBFLAG =
RELEASE = 0
UNICODE = 0
-LOADHDR = -I ./ -I ../../XEngine_ThirdPart/jsoncpp
-LOADSO = -L ../../XEngine_ThirdPart/jsoncpp
+LOADHDR = -I ./ -I ../../XEngine_Depend/XEngine_Module/jsoncpp
+LOADSO = -L ../../XEngine_Depend/XEngine_Module/jsoncpp
LIB = -lXEngine_BaseLib -ljsoncpp
LIBEX =
OBJECTS = Plugin_Zodiac.o pch.o
diff --git a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Zodiac/ModulePlugin_Zodiac.vcxproj b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Zodiac/ModulePlugin_Zodiac.vcxproj
index e5bd63c..5098ba5 100644
--- a/XEngine_Source/XEngine_PluginModule/ModulePlugin_Zodiac/ModulePlugin_Zodiac.vcxproj
+++ b/XEngine_Source/XEngine_PluginModule/ModulePlugin_Zodiac/ModulePlugin_Zodiac.vcxproj
@@ -75,7 +75,7 @@
true
$(Configuration)\XEngine_LibPlugin\
$(SolutionDir)$(Configuration)\XEngine_LibPlugin\
- $(XEngine_Include);../../XEngine_ThirdPart/jsoncpp;$(IncludePath)
+ $(XEngine_Include);../../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)
$(XEngine_Lib32);$(LibraryPath)
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/Makefile b/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/Makefile
index c4b4e10..d83a5cc 100644
--- a/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/Makefile
+++ b/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/Makefile
@@ -6,9 +6,9 @@ FILEEXT =
LIBFLAG =
RELEASE = 0
UNICODE = 0
-LOADHDR = -I ./ -I ../XEngine_ThirdPart/jsoncpp
+LOADHDR = -I ./
LOADSO = -L ../../XEngine_ModuleConfigure -L ../../XEngine_ModuleDatabase -L ../../XEngine_ModuleProtocol -L ../../XEngine_ModuleSystem -L ../../XEngine_ModuleHelp -L ../../XEngine_ModulePlugin \
- -L ../../XEngine_ThirdPart/jsoncpp
+ -L ../../XEngine_Depend/XEngine_Module/jsoncpp
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_OPenSsl -lXClient_Stream -lXClient_APIHelp -lHelpComponents_XLog -lRfcComponents_HttpProtocol -lXEngine_ProcFile -lXEngine_SystemApi -lXEngine_AVHelp -lXEngine_VideoCodec -lXEngine_AudioCodec -lXEngine_AVCollect \
-lXEngine_ModuleConfigure -lXEngine_ModuleDatabase -lXEngine_ModuleProtocol -lXEngine_ModuleSystem -lXEngine_ModuleHelp -lXEngine_ModulePlugin \
-ljsoncpp
diff --git a/XEngine_Source/XEngine_ThirdPart/jsoncpp/Makefile b/XEngine_Source/XEngine_ThirdPart/jsoncpp/Makefile
deleted file mode 100644
index 39af933..0000000
--- a/XEngine_Source/XEngine_ThirdPart/jsoncpp/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-CC = g++ -Wall -std=c++17 -fPIC
-PLATFORM = linux
-PLATVER =
-PLATDIR =
-FILEEXT =
-LIBFLAG =
-RELEASE = 0
-UNICODE = 0
-LOADHDR = -I ./
-LOADSO = -L
-LIB =
-LIBEX =
-OBJECTS = json_reader.o json_value.o json_writer.o
-
-ifeq ($(RELEASE),1)
-FLAGS = -c
-DEBUG =
-else
-FLAGS = -c -lc_p
-DEBUG = -g -pg
-endif
-
-ifeq ($(UNICODE),1)
-UNICODE = -D _UNICODE
-else
-UNICODE =
-endif
-
-ifeq ($(PLATFORM),linux)
- ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
- PLATVER = -D __CENTOS__
- PLATDIR = XEngine_Linux/Centos
- else
- PLATVER = -D __UBUNTU__
- PLATDIR = XEngine_Linux/Ubuntu
- endif
- FILEEXT = so
- LIBFLAG = -shared
- LIBEX = -lpthread -lrt -ldl
- LOADBIN = -Wl,-rpath=./,--disable-new-dtags
-else ifeq ($(PLATFORM),mac)
- CC += -Wno-deprecated-declarations
- PLATVER = -D __MACOS__
- PLATDIR = XEngine_Mac
- FILEEXT = dylib
- LIBFLAG = -dynamiclib
- LIBEX = -lpthread -ldl
- LOADBIN = -Wl,-rpath,@loader_path/./
-endif
-
-all:$(OBJECTS)
- $(CC) $(DEBUG) $(OBJECTS) -o libjsoncpp.$(FILEEXT) $(LIBFLAG) $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
-
-json_reader.o:json_reader.cpp
- $(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) json_reader.cpp
-json_value.o:json_value.cpp
- $(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) json_value.cpp
-json_writer.o:json_writer.cpp
- $(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) json_writer.cpp
-
-InstallAll:InstallSo
-InstallSo:./libjsoncpp.$(FILEEXT)
- cp ./libjsoncpp.$(FILEEXT) ../../../XEngine_Release/libjsoncpp.$(FILEEXT)
-
-
-
-CleanAll:CleanObj CleanMk
-CleanObj:
- rm *.o
-CleanMk:
- rm *.$(FILEEXT)
diff --git a/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/allocator.h b/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/allocator.h
deleted file mode 100644
index d669dda..0000000
--- a/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/allocator.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_ALLOCATOR_H_INCLUDED
-#define JSON_ALLOCATOR_H_INCLUDED
-
-#include
-#include
-
-#pragma pack(push, 8)
-
-namespace Json {
-template class SecureAllocator {
-public:
- // Type definitions
- using value_type = T;
- using pointer = T*;
- using const_pointer = const T*;
- using reference = T&;
- using const_reference = const T&;
- using size_type = std::size_t;
- using difference_type = std::ptrdiff_t;
-
- /**
- * Allocate memory for N items using the standard allocator.
- */
- pointer allocate(size_type n) {
- // allocate using "global operator new"
- return static_cast(::operator new(n * sizeof(T)));
- }
-
- /**
- * Release memory which was allocated for N items at pointer P.
- *
- * The memory block is filled with zeroes before being released.
- */
- void deallocate(pointer p, size_type n) {
- // memset_s is used because memset may be optimized away by the compiler
- memset_s(p, n * sizeof(T), 0, n * sizeof(T));
- // free using "global operator delete"
- ::operator delete(p);
- }
-
- /**
- * Construct an item in-place at pointer P.
- */
- template void construct(pointer p, Args&&... args) {
- // construct using "placement new" and "perfect forwarding"
- ::new (static_cast(p)) T(std::forward(args)...);
- }
-
- size_type max_size() const { return size_t(-1) / sizeof(T); }
-
- pointer address(reference x) const { return std::addressof(x); }
-
- const_pointer address(const_reference x) const { return std::addressof(x); }
-
- /**
- * Destroy an item in-place at pointer P.
- */
- void destroy(pointer p) {
- // destroy using "explicit destructor"
- p->~T();
- }
-
- // Boilerplate
- SecureAllocator() {}
- template SecureAllocator(const SecureAllocator&) {}
- template struct rebind { using other = SecureAllocator; };
-};
-
-template
-bool operator==(const SecureAllocator&, const SecureAllocator&) {
- return true;
-}
-
-template
-bool operator!=(const SecureAllocator&, const SecureAllocator&) {
- return false;
-}
-
-} // namespace Json
-
-#pragma pack(pop)
-
-#endif // JSON_ALLOCATOR_H_INCLUDED
diff --git a/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/assertions.h b/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/assertions.h
deleted file mode 100644
index 0a0120d..0000000
--- a/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/assertions.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_ASSERTIONS_H_INCLUDED
-#define JSON_ASSERTIONS_H_INCLUDED
-
-#include
-#include
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include "config.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-
-/** It should not be possible for a maliciously designed file to
- * cause an abort() or seg-fault, so these macros are used only
- * for pre-condition violations and internal logic errors.
- */
-#if JSON_USE_EXCEPTION
-
-// @todo <= add detail about condition in exception
-#define JSON_ASSERT(condition) \
- do { \
- if (!(condition)) { \
- Json::throwLogicError("assert json failed"); \
- } \
- } while (0)
-
-#define JSON_FAIL_MESSAGE(message) \
- do { \
- OStringStream oss; \
- oss << message; \
- Json::throwLogicError(oss.str()); \
- abort(); \
- } while (0)
-
-#else // JSON_USE_EXCEPTION
-
-#define JSON_ASSERT(condition) assert(condition)
-
-// The call to assert() will show the failure message in debug builds. In
-// release builds we abort, for a core-dump or debugger.
-#define JSON_FAIL_MESSAGE(message) \
- { \
- OStringStream oss; \
- oss << message; \
- assert(false && oss.str().c_str()); \
- abort(); \
- }
-
-#endif
-
-#define JSON_ASSERT_MESSAGE(condition, message) \
- do { \
- if (!(condition)) { \
- JSON_FAIL_MESSAGE(message); \
- } \
- } while (0)
-
-#endif // JSON_ASSERTIONS_H_INCLUDED
diff --git a/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/config.h b/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/config.h
deleted file mode 100644
index 81d7969..0000000
--- a/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/config.h
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_CONFIG_H_INCLUDED
-#define JSON_CONFIG_H_INCLUDED
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-// If non-zero, the library uses exceptions to report bad input instead of C
-// assertion macros. The default is to use exceptions.
-#ifndef JSON_USE_EXCEPTION
-#define JSON_USE_EXCEPTION 1
-#endif
-
-// Temporary, tracked for removal with issue #982.
-#ifndef JSON_USE_NULLREF
-#define JSON_USE_NULLREF 1
-#endif
-
-/// If defined, indicates that the source file is amalgamated
-/// to prevent private header inclusion.
-/// Remarks: it is automatically defined in the generated amalgamated header.
-// #define JSON_IS_AMALGAMATION
-
-// Export macros for DLL visibility
-#if defined(JSON_DLL_BUILD)
-#if defined(_MSC_VER) || defined(__MINGW32__)
-#define JSON_API __declspec(dllexport)
-#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
-#elif defined(__GNUC__) || defined(__clang__)
-#define JSON_API __attribute__((visibility("default")))
-#endif // if defined(_MSC_VER)
-
-#elif defined(JSON_DLL)
-#if defined(_MSC_VER) || defined(__MINGW32__)
-#define JSON_API __declspec(dllimport)
-#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
-#endif // if defined(_MSC_VER)
-#endif // ifdef JSON_DLL_BUILD
-
-#if !defined(JSON_API)
-#define JSON_API
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER < 1800
-#error \
- "ERROR: Visual Studio 12 (2013) with _MSC_VER=1800 is the oldest supported compiler with sufficient C++11 capabilities"
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER < 1900
-// As recommended at
-// https://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010
-extern JSON_API int msvc_pre1900_c99_snprintf(char* outBuf, size_t size,
- const char* format, ...);
-#define jsoncpp_snprintf msvc_pre1900_c99_snprintf
-#else
-#define jsoncpp_snprintf std::snprintf
-#endif
-
-// If JSON_NO_INT64 is defined, then Json only support C++ "int" type for
-// integer
-// Storages, and 64 bits integer support is disabled.
-// #define JSON_NO_INT64 1
-
-// JSONCPP_OVERRIDE is maintained for backwards compatibility of external tools.
-// C++11 should be used directly in JSONCPP.
-#define JSONCPP_OVERRIDE override
-
-#ifdef __clang__
-#if __has_extension(attribute_deprecated_with_message)
-#define JSONCPP_DEPRECATED(message) __attribute__((deprecated(message)))
-#endif
-#elif defined(__GNUC__) // not clang (gcc comes later since clang emulates gcc)
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
-#define JSONCPP_DEPRECATED(message) __attribute__((deprecated(message)))
-#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
-#define JSONCPP_DEPRECATED(message) __attribute__((__deprecated__))
-#endif // GNUC version
-#elif defined(_MSC_VER) // MSVC (after clang because clang on Windows emulates
- // MSVC)
-#define JSONCPP_DEPRECATED(message) __declspec(deprecated(message))
-#endif // __clang__ || __GNUC__ || _MSC_VER
-
-#if !defined(JSONCPP_DEPRECATED)
-#define JSONCPP_DEPRECATED(message)
-#endif // if !defined(JSONCPP_DEPRECATED)
-
-#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ >= 6))
-#define JSON_USE_INT64_DOUBLE_CONVERSION 1
-#endif
-
-#if !defined(JSON_IS_AMALGAMATION)
-
-#include "allocator.h"
-#include "version.h"
-
-#endif // if !defined(JSON_IS_AMALGAMATION)
-
-namespace Json {
-using Int = int;
-using UInt = unsigned int;
-#if defined(JSON_NO_INT64)
-using LargestInt = int;
-using LargestUInt = unsigned int;
-#undef JSON_HAS_INT64
-#else // if defined(JSON_NO_INT64)
-// For Microsoft Visual use specific types as long long is not supported
-#if defined(_MSC_VER) // Microsoft Visual Studio
-using Int64 = __int64;
-using UInt64 = unsigned __int64;
-#else // if defined(_MSC_VER) // Other platforms, use long long
-using Int64 = int64_t;
-using UInt64 = uint64_t;
-#endif // if defined(_MSC_VER)
-using LargestInt = Int64;
-using LargestUInt = UInt64;
-#define JSON_HAS_INT64
-#endif // if defined(JSON_NO_INT64)
-
-template
-using Allocator =
- typename std::conditional,
- std::allocator>::type;
-using String = std::basic_string, Allocator>;
-using IStringStream =
- std::basic_istringstream;
-using OStringStream =
- std::basic_ostringstream;
-using IStream = std::istream;
-using OStream = std::ostream;
-} // namespace Json
-
-// Legacy names (formerly macros).
-using JSONCPP_STRING = Json::String;
-using JSONCPP_ISTRINGSTREAM = Json::IStringStream;
-using JSONCPP_OSTRINGSTREAM = Json::OStringStream;
-using JSONCPP_ISTREAM = Json::IStream;
-using JSONCPP_OSTREAM = Json::OStream;
-
-#endif // JSON_CONFIG_H_INCLUDED
diff --git a/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/forwards.h b/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/forwards.h
deleted file mode 100644
index 733b9d6..0000000
--- a/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/forwards.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_FORWARDS_H_INCLUDED
-#define JSON_FORWARDS_H_INCLUDED
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include "config.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-
-namespace Json {
-
-// writer.h
-class StreamWriter;
-class StreamWriterBuilder;
-class Writer;
-class FastWriter;
-class StyledWriter;
-class StyledStreamWriter;
-
-// reader.h
-class Reader;
-class CharReader;
-class CharReaderBuilder;
-
-// json_features.h
-class Features;
-
-// value.h
-using ArrayIndex = unsigned int;
-class StaticString;
-class Path;
-class PathArgument;
-class Value;
-class ValueIteratorBase;
-class ValueIterator;
-class ValueConstIterator;
-
-} // namespace Json
-
-#endif // JSON_FORWARDS_H_INCLUDED
diff --git a/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/json.h b/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/json.h
deleted file mode 100644
index c6a9bbd..0000000
--- a/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/json.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_JSON_H_INCLUDED
-#define JSON_JSON_H_INCLUDED
-
-#include "config.h"
-#include "json_features.h"
-#include "reader.h"
-#include "value.h"
-#include "writer.h"
-
-#endif // JSON_JSON_H_INCLUDED
diff --git a/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/json_features.h b/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/json_features.h
deleted file mode 100644
index 6d881b8..0000000
--- a/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/json_features.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_FEATURES_H_INCLUDED
-#define JSON_FEATURES_H_INCLUDED
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include "forwards.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-
-#pragma pack(push, 8)
-
-namespace Json {
-
-/** \brief Configuration passed to reader and writer.
- * This configuration object can be used to force the Reader or Writer
- * to behave in a standard conforming way.
- */
-class JSON_API Features {
-public:
- /** \brief A configuration that allows all features and assumes all strings
- * are UTF-8.
- * - C & C++ comments are allowed
- * - Root object can be any JSON value
- * - Assumes Value strings are encoded in UTF-8
- */
- static Features all();
-
- /** \brief A configuration that is strictly compatible with the JSON
- * specification.
- * - Comments are forbidden.
- * - Root object must be either an array or an object value.
- * - Assumes Value strings are encoded in UTF-8
- */
- static Features strictMode();
-
- /** \brief Initialize the configuration like JsonConfig::allFeatures;
- */
- Features();
-
- /// \c true if comments are allowed. Default: \c true.
- bool allowComments_{true};
-
- /// \c true if root must be either an array or an object value. Default: \c
- /// false.
- bool strictRoot_{false};
-
- /// \c true if dropped null placeholders are allowed. Default: \c false.
- bool allowDroppedNullPlaceholders_{false};
-
- /// \c true if numeric object key are allowed. Default: \c false.
- bool allowNumericKeys_{false};
-};
-
-} // namespace Json
-
-#pragma pack(pop)
-
-#endif // JSON_FEATURES_H_INCLUDED
diff --git a/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/reader.h b/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/reader.h
deleted file mode 100644
index 775037e..0000000
--- a/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/reader.h
+++ /dev/null
@@ -1,405 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_READER_H_INCLUDED
-#define JSON_READER_H_INCLUDED
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include "json_features.h"
-#include "value.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-#include
-#include
-#include
-#include
-#include
-
-// Disable warning C4251: : needs to have dll-interface to
-// be used by...
-#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-#pragma warning(push)
-#pragma warning(disable : 4251)
-#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-
-#pragma pack(push, 8)
-
-namespace Json {
-
-/** \brief Unserialize a JSON document into a
- * Value.
- *
- * \deprecated Use CharReader and CharReaderBuilder.
- */
-
-class JSON_API Reader {
-public:
- using Char = char;
- using Location = const Char*;
-
- /** \brief An error tagged with where in the JSON text it was encountered.
- *
- * The offsets give the [start, limit) range of bytes within the text. Note
- * that this is bytes, not codepoints.
- */
- struct StructuredError {
- ptrdiff_t offset_start;
- ptrdiff_t offset_limit;
- String message;
- };
-
- /** \brief Constructs a Reader allowing all features for parsing.
- * \deprecated Use CharReader and CharReaderBuilder.
- */
- Reader();
-
- /** \brief Constructs a Reader allowing the specified feature set for parsing.
- * \deprecated Use CharReader and CharReaderBuilder.
- */
- Reader(const Features& features);
-
- /** \brief Read a Value from a JSON
- * document.
- *
- * \param document UTF-8 encoded string containing the document
- * to read.
- * \param[out] root Contains the root value of the document if it
- * was successfully parsed.
- * \param collectComments \c true to collect comment and allow writing
- * them back during serialization, \c false to
- * discard comments. This parameter is ignored
- * if Features::allowComments_ is \c false.
- * \return \c true if the document was successfully parsed, \c false if an
- * error occurred.
- */
- bool parse(const std::string& document, Value& root,
- bool collectComments = true);
-
- /** \brief Read a Value from a JSON
- * document.
- *
- * \param beginDoc Pointer on the beginning of the UTF-8 encoded
- * string of the document to read.
- * \param endDoc Pointer on the end of the UTF-8 encoded string
- * of the document to read. Must be >= beginDoc.
- * \param[out] root Contains the root value of the document if it
- * was successfully parsed.
- * \param collectComments \c true to collect comment and allow writing
- * them back during serialization, \c false to
- * discard comments. This parameter is ignored
- * if Features::allowComments_ is \c false.
- * \return \c true if the document was successfully parsed, \c false if an
- * error occurred.
- */
- bool parse(const char* beginDoc, const char* endDoc, Value& root,
- bool collectComments = true);
-
- /// \brief Parse from input stream.
- /// \see Json::operator>>(std::istream&, Json::Value&).
- bool parse(IStream& is, Value& root, bool collectComments = true);
-
- /** \brief Returns a user friendly string that list errors in the parsed
- * document.
- *
- * \return Formatted error message with the list of errors with their
- * location in the parsed document. An empty string is returned if no error
- * occurred during parsing.
- * \deprecated Use getFormattedErrorMessages() instead (typo fix).
- */
- JSONCPP_DEPRECATED("Use getFormattedErrorMessages() instead.")
- String getFormatedErrorMessages() const;
-
- /** \brief Returns a user friendly string that list errors in the parsed
- * document.
- *
- * \return Formatted error message with the list of errors with their
- * location in the parsed document. An empty string is returned if no error
- * occurred during parsing.
- */
- String getFormattedErrorMessages() const;
-
- /** \brief Returns a vector of structured errors encountered while parsing.
- *
- * \return A (possibly empty) vector of StructuredError objects. Currently
- * only one error can be returned, but the caller should tolerate multiple
- * errors. This can occur if the parser recovers from a non-fatal parse
- * error and then encounters additional errors.
- */
- std::vector getStructuredErrors() const;
-
- /** \brief Add a semantic error message.
- *
- * \param value JSON Value location associated with the error
- * \param message The error message.
- * \return \c true if the error was successfully added, \c false if the Value
- * offset exceeds the document size.
- */
- bool pushError(const Value& value, const String& message);
-
- /** \brief Add a semantic error message with extra context.
- *
- * \param value JSON Value location associated with the error
- * \param message The error message.
- * \param extra Additional JSON Value location to contextualize the error
- * \return \c true if the error was successfully added, \c false if either
- * Value offset exceeds the document size.
- */
- bool pushError(const Value& value, const String& message, const Value& extra);
-
- /** \brief Return whether there are any errors.
- *
- * \return \c true if there are no errors to report \c false if errors have
- * occurred.
- */
- bool good() const;
-
-private:
- enum TokenType {
- tokenEndOfStream = 0,
- tokenObjectBegin,
- tokenObjectEnd,
- tokenArrayBegin,
- tokenArrayEnd,
- tokenString,
- tokenNumber,
- tokenTrue,
- tokenFalse,
- tokenNull,
- tokenArraySeparator,
- tokenMemberSeparator,
- tokenComment,
- tokenError
- };
-
- class Token {
- public:
- TokenType type_;
- Location start_;
- Location end_;
- };
-
- class ErrorInfo {
- public:
- Token token_;
- String message_;
- Location extra_;
- };
-
- using Errors = std::deque;
-
- bool readToken(Token& token);
- void skipSpaces();
- bool match(const Char* pattern, int patternLength);
- bool readComment();
- bool readCStyleComment();
- bool readCppStyleComment();
- bool readString();
- void readNumber();
- bool readValue();
- bool readObject(Token& token);
- bool readArray(Token& token);
- bool decodeNumber(Token& token);
- bool decodeNumber(Token& token, Value& decoded);
- bool decodeString(Token& token);
- bool decodeString(Token& token, String& decoded);
- bool decodeDouble(Token& token);
- bool decodeDouble(Token& token, Value& decoded);
- bool decodeUnicodeCodePoint(Token& token, Location& current, Location end,
- unsigned int& unicode);
- bool decodeUnicodeEscapeSequence(Token& token, Location& current,
- Location end, unsigned int& unicode);
- bool addError(const String& message, Token& token, Location extra = nullptr);
- bool recoverFromError(TokenType skipUntilToken);
- bool addErrorAndRecover(const String& message, Token& token,
- TokenType skipUntilToken);
- void skipUntilSpace();
- Value& currentValue();
- Char getNextChar();
- void getLocationLineAndColumn(Location location, int& line,
- int& column) const;
- String getLocationLineAndColumn(Location location) const;
- void addComment(Location begin, Location end, CommentPlacement placement);
- void skipCommentTokens(Token& token);
-
- static bool containsNewLine(Location begin, Location end);
- static String normalizeEOL(Location begin, Location end);
-
- using Nodes = std::stack;
- Nodes nodes_;
- Errors errors_;
- String document_;
- Location begin_{};
- Location end_{};
- Location current_{};
- Location lastValueEnd_{};
- Value* lastValue_{};
- String commentsBefore_;
- Features features_;
- bool collectComments_{};
-}; // Reader
-
-/** Interface for reading JSON from a char array.
- */
-class JSON_API CharReader {
-public:
- virtual ~CharReader() = default;
- /** \brief Read a Value from a JSON
- * document. The document must be a UTF-8 encoded string containing the
- * document to read.
- *
- * \param beginDoc Pointer on the beginning of the UTF-8 encoded string
- * of the document to read.
- * \param endDoc Pointer on the end of the UTF-8 encoded string of the
- * document to read. Must be >= beginDoc.
- * \param[out] root Contains the root value of the document if it was
- * successfully parsed.
- * \param[out] errs Formatted error messages (if not NULL) a user
- * friendly string that lists errors in the parsed
- * document.
- * \return \c true if the document was successfully parsed, \c false if an
- * error occurred.
- */
- virtual bool parse(char const* beginDoc, char const* endDoc, Value* root,
- String* errs) = 0;
-
- class JSON_API Factory {
- public:
- virtual ~Factory() = default;
- /** \brief Allocate a CharReader via operator new().
- * \throw std::exception if something goes wrong (e.g. invalid settings)
- */
- virtual CharReader* newCharReader() const = 0;
- }; // Factory
-}; // CharReader
-
-/** \brief Build a CharReader implementation.
- *
- * Usage:
- * \code
- * using namespace Json;
- * CharReaderBuilder builder;
- * builder["collectComments"] = false;
- * Value value;
- * String errs;
- * bool ok = parseFromStream(builder, std::cin, &value, &errs);
- * \endcode
- */
-class JSON_API CharReaderBuilder : public CharReader::Factory {
-public:
- // Note: We use a Json::Value so that we can add data-members to this class
- // without a major version bump.
- /** Configuration of this builder.
- * These are case-sensitive.
- * Available settings (case-sensitive):
- * - `"collectComments": false or true`
- * - true to collect comment and allow writing them back during
- * serialization, false to discard comments. This parameter is ignored
- * if allowComments is false.
- * - `"allowComments": false or true`
- * - true if comments are allowed.
- * - `"allowTrailingCommas": false or true`
- * - true if trailing commas in objects and arrays are allowed.
- * - `"strictRoot": false or true`
- * - true if root must be either an array or an object value
- * - `"allowDroppedNullPlaceholders": false or true`
- * - true if dropped null placeholders are allowed. (See
- * StreamWriterBuilder.)
- * - `"allowNumericKeys": false or true`
- * - true if numeric object keys are allowed.
- * - `"allowSingleQuotes": false or true`
- * - true if '' are allowed for strings (both keys and values)
- * - `"stackLimit": integer`
- * - Exceeding stackLimit (recursive depth of `readValue()`) will cause an
- * exception.
- * - This is a security issue (seg-faults caused by deeply nested JSON), so
- * the default is low.
- * - `"failIfExtra": false or true`
- * - If true, `parse()` returns false when extra non-whitespace trails the
- * JSON value in the input string.
- * - `"rejectDupKeys": false or true`
- * - If true, `parse()` returns false when a key is duplicated within an
- * object.
- * - `"allowSpecialFloats": false or true`
- * - If true, special float values (NaNs and infinities) are allowed and
- * their values are lossfree restorable.
- * - `"skipBom": false or true`
- * - If true, if the input starts with the Unicode byte order mark (BOM),
- * it is skipped.
- *
- * You can examine 'settings_` yourself to see the defaults. You can also
- * write and read them just like any JSON Value.
- * \sa setDefaults()
- */
- Json::Value settings_;
-
- CharReaderBuilder();
- ~CharReaderBuilder() override;
-
- CharReader* newCharReader() const override;
-
- /** \return true if 'settings' are legal and consistent;
- * otherwise, indicate bad settings via 'invalid'.
- */
- bool validate(Json::Value* invalid) const;
-
- /** A simple way to update a specific setting.
- */
- Value& operator[](const String& key);
-
- /** Called by ctor, but you can use this to reset settings_.
- * \pre 'settings' != NULL (but Json::null is fine)
- * \remark Defaults:
- * \snippet src/lib_json/json_reader.cpp CharReaderBuilderDefaults
- */
- static void setDefaults(Json::Value* settings);
- /** Same as old Features::strictMode().
- * \pre 'settings' != NULL (but Json::null is fine)
- * \remark Defaults:
- * \snippet src/lib_json/json_reader.cpp CharReaderBuilderStrictMode
- */
- static void strictMode(Json::Value* settings);
-};
-
-/** Consume entire stream and use its begin/end.
- * Someday we might have a real StreamReader, but for now this
- * is convenient.
- */
-bool JSON_API parseFromStream(CharReader::Factory const&, IStream&, Value* root,
- String* errs);
-
-/** \brief Read from 'sin' into 'root'.
- *
- * Always keep comments from the input JSON.
- *
- * This can be used to read a file into a particular sub-object.
- * For example:
- * \code
- * Json::Value root;
- * cin >> root["dir"]["file"];
- * cout << root;
- * \endcode
- * Result:
- * \verbatim
- * {
- * "dir": {
- * "file": {
- * // The input stream JSON would be nested here.
- * }
- * }
- * }
- * \endverbatim
- * \throw std::exception on parse error.
- * \see Json::operator<<()
- */
-JSON_API IStream& operator>>(IStream&, Value&);
-
-} // namespace Json
-
-#pragma pack(pop)
-
-#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-#pragma warning(pop)
-#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-
-#endif // JSON_READER_H_INCLUDED
diff --git a/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/value.h b/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/value.h
deleted file mode 100644
index d24ca53..0000000
--- a/XEngine_Source/XEngine_ThirdPart/jsoncpp/json/value.h
+++ /dev/null
@@ -1,935 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_H_INCLUDED
-#define JSON_H_INCLUDED
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include "forwards.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-
-// Conditional NORETURN attribute on the throw functions would:
-// a) suppress false positives from static code analysis
-// b) possibly improve optimization opportunities.
-#if !defined(JSONCPP_NORETURN)
-#if defined(_MSC_VER) && _MSC_VER == 1800
-#define JSONCPP_NORETURN __declspec(noreturn)
-#else
-#define JSONCPP_NORETURN [[noreturn]]
-#endif
-#endif
-
-// Support for '= delete' with template declarations was a late addition
-// to the c++11 standard and is rejected by clang 3.8 and Apple clang 8.2
-// even though these declare themselves to be c++11 compilers.
-#if !defined(JSONCPP_TEMPLATE_DELETE)
-#if defined(__clang__) && defined(__apple_build_version__)
-#if __apple_build_version__ <= 8000042
-#define JSONCPP_TEMPLATE_DELETE
-#endif
-#elif defined(__clang__)
-#if __clang_major__ == 3 && __clang_minor__ <= 8
-#define JSONCPP_TEMPLATE_DELETE
-#endif
-#endif
-#if !defined(JSONCPP_TEMPLATE_DELETE)
-#define JSONCPP_TEMPLATE_DELETE = delete
-#endif
-#endif
-
-#include
-#include
-#include