delete:proxy full enable field

xengine-qyt · xengine-qyt · commit 7aba019cc9bc · 2025-03-25T13:34:34.000+08:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -8,6 +8,7 @@ XEngine_ProxyServer V1.12.0.1001
 修改:统一转发和隧道代理错误
 修改:匿名转发打印问题
 修改:全代理多后端支持
+修改:信息报告现在可以直接发送获取次数了
 修正:没有输出转发绑定错误信息的问题
 修正:转发网络的问题在接受数据时不会区分命名和匿名数据
 修正:匿名保存客户端地址丢失问题
@@ -21,7 +22,7 @@ improved:forward protocol handle
 modify:unified forward and tunnel error code
 modify:print port for anny forward
 modify:multi back-end support for proxy full
-modify:
+modify:get time when send for report info 
 fixed:not print forward bind error
 fixed:issue with forwarding network not distinguishing between named and anonymized data when accepting data
 fixed:anony save client addr lost port
diff --git a/XEngine_Docment/Docment_en.docx b/XEngine_Docment/Docment_en.docx
diff --git a/XEngine_Docment/Docment_zh.docx b/XEngine_Docment/Docment_zh.docx
diff --git a/XEngine_Release/XEngine_Config/XEngine_Config.json b/XEngine_Release/XEngine_Config/XEngine_Config.json
@@ -31,7 +31,6 @@
       "tszServiceName":"XEngine_ProxyServer"
   },
   "XProxy": {
-    "bEnable": false,
     "tszDefaultAddr": "10.0.4.69:5403", 
     "tszRuleIPAddr": [
       "10.0.0.1-10.0.4.69:5403",
diff --git a/XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h b/XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h
@@ -52,7 +52,6 @@ typedef struct tag_XEngine_ServiceConfig
 	}st_XReport;
 	struct
 	{
-		bool bEnable;
 		XCHAR tszDefaultAddr[128];
 		std::list<xstring>* pStl_ListRuleAddr;
 	}st_XProxy;
diff --git a/XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp b/XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp
@@ -147,7 +147,6 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 	Json::Value st_JsonXProxy = st_JsonRoot["XProxy"];
 
 	pSt_ServerConfig->st_XProxy.pStl_ListRuleAddr = new list<xstring>;
-	pSt_ServerConfig->st_XProxy.bEnable = st_JsonXProxy["bEnable"].asBool();
 	_tcsxcpy(pSt_ServerConfig->st_XProxy.tszDefaultAddr, st_JsonXProxy["tszDefaultAddr"].asCString());
 	if (!st_JsonXProxy["tszRuleIPAddr"].isNull())
 	{

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ typedef struct tag_XEngine_ServiceConfig`
`52`	`52`	`}st_XReport;`
`53`	`53`	`struct`
`54`	`54`	`{`
`55`		`- bool bEnable;`
`56`	`55`	`XCHAR tszDefaultAddr[128];`
`57`	`56`	`std::list<xstring>* pStl_ListRuleAddr;`
`58`	`57`	`}st_XProxy;`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,6 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE`
`147`	`147`	`Json::Value st_JsonXProxy = st_JsonRoot["XProxy"];`
`148`	`148`
`149`	`149`	`pSt_ServerConfig->st_XProxy.pStl_ListRuleAddr = new list<xstring>;`
`150`		`- pSt_ServerConfig->st_XProxy.bEnable = st_JsonXProxy["bEnable"].asBool();`
`151`	`150`	`_tcsxcpy(pSt_ServerConfig->st_XProxy.tszDefaultAddr, st_JsonXProxy["tszDefaultAddr"].asCString());`
`152`	`151`	`if (!st_JsonXProxy["tszRuleIPAddr"].isNull())`
`153`	`152`	`{`