Skip to content

Commit a838c19

Browse files
authored
Merge pull request #12 from libxengine/develop
V1.7.1.1001 Merge
2 parents 05391c4 + 72f0bb2 commit a838c19

File tree

9 files changed

+23
-20
lines changed

9 files changed

+23
-20
lines changed

CHANGELOG

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
XEngine_ProxyServer V1.7.1.1001
2+
3+
更新:匹配XEngine V8.25
4+
删除:授权验证功能
5+
6+
update:match xengine v8.25
7+
delete:authorize supported
8+
======================================================================================
19
XEngine_ProxyServer V1.7.0.1001
210

311
增加:转发协议支持用户验证了

README.en.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@ this software support following features
1515
1. SOCKS5 proxy
1616
2. Tunnel proxy
1717
3. TCP forward proxy
18-
4. support Permission Validation
19-
5. operator log
20-
6. encrypt Communication(planning)
21-
7. load balanc(planning)
22-
8. custom cert proxy protocol(planning)
23-
9. multilevel proxy(planning)
18+
4. operator log
19+
5. encrypt Communication(planning)
20+
6. load balanc(planning)
21+
7. custom cert proxy protocol(planning)
22+
8. multilevel proxy(planning)
2423

2524
## install
2625

README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@ c c++ Socks5 Proxy Service,HTTP Tunnel Proxy Service,tcp forward service
1515
1. SOCKS5代理
1616
2. Tunnel代理
1717
3. TCP数据转发服务
18-
4. 权限验证
19-
5. 操作日志
20-
6. 加密通信(planning)
21-
7. 负载均衡(planning)
22-
8. 自定义证书代理协议(planning)
23-
9. 多级代理(planning)
18+
4. 操作日志
19+
5. 加密通信(planning)
20+
6. 负载均衡(planning)
21+
7. 自定义证书代理协议(planning)
22+
8. 多级代理(planning)
2423

2524
## 安装教程
2625

XEngine_APPClient/APPClient_ForwardExample/APPClient_ForwardExample.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
//需要优先配置XEngine
2727
//WINDOWS支持VS2022 x86 debug 编译调试
2828
//linux使用下面的命令编译
29-
//g++ -std=c++17 -Wall -g APPClient_ForwardExample.cpp -o APPClient_ForwardExample.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Client -L /usr/local/lib/XEngine_Release/XEngine_RfcComponents -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lXClient_Socket -lRfcComponents_ProxyProtocol -ljsoncpp -Wl,-rpath=../../XEngine_Source/XEngine_ThirdPart/jsoncpp,--disable-new-dtags
29+
//g++ -std=c++17 -Wall -g APPClient_ForwardExample.cpp -o APPClient_ForwardExample.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lXClient_Socket -lRfcComponents_ProxyProtocol -ljsoncpp
3030

3131
int main(int argc, char** argv)
3232
{

XEngine_APPClient/APPClient_SocksExample/APPClient_SocksExample.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
//需要优先配置XEngine
2424
//WINDOWS支持VS2022 x86 debug 编译调试
2525
//linux使用下面的命令编译
26-
//g++ -std=c++17 -Wall -g APPClient_SocksExample.cpp -o APPClient_SocksExample.exe -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Client -L /usr/local/lib/XEngine_Release/XEngine_RfcComponents -lXEngine_BaseLib -lXClient_Socket -lRfcComponents_ProxyProtocol
26+
//g++ -std=c++17 -Wall -g APPClient_SocksExample.cpp -o APPClient_SocksExample.exe -lXEngine_BaseLib -lXClient_Socket -lRfcComponents_ProxyProtocol
2727
int main(int argc, char** argv)
2828
{
2929
#ifdef _MSC_BUILD

XEngine_APPClient/APPClient_TunnelExample/APPClient_TunnelExample.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
//需要优先配置XEngine
2424
//WINDOWS支持VS2022 x86 debug 编译调试
2525
//linux使用下面的命令编译
26-
//g++ -std=c++17 -Wall -g APPClient_TunnelExample.cpp -o APPClient_TunnelExample.exe -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Client -L /usr/local/lib/XEngine_Release/XEngine_RfcComponents -lXEngine_BaseLib -lXClient_Socket -lRfcComponents_ProxyProtocol
26+
//g++ -std=c++17 -Wall -g APPClient_TunnelExample.cpp -o APPClient_TunnelExample.exe -lXEngine_BaseLib -lXClient_Socket -lRfcComponents_ProxyProtocol
2727
int main(int argc, char** argv)
2828
{
2929
#ifdef _MSC_BUILD

XEngine_Docment/Docment_en.docx

-168 Bytes
Binary file not shown.

XEngine_Docment/Docment_zh.docx

-159 Bytes
Binary file not shown.

XEngine_Release/XEngine_Config/XEngine_Config.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,16 @@
1414
"nTimeCheck": 3,
1515
"nSocksTimeOut": 5,
1616
"nTunnelTimeOut": 5,
17-
"nForwardTimeOut": 0
17+
"nForwardTimeOut": 5
1818
},
1919
"XLog": {
2020
"MaxSize": 1024000,
2121
"MaxCount": 10,
2222
"LogLeave": 32,
2323
"tszLogFile": "./XEngine_Log/XEngine_ProxyServiceApp.log"
2424
},
25-
"XAuth": {
26-
"bAuth": false,
27-
"tszAuthUrl": ""
28-
},
2925
"XVer": [
26+
"1.7.1.1001 Build20240305",
3027
"1.7.0.1001 Build20240104",
3128
"1.6.0.1001 Build20230817",
3229
"1.5.1.1001 Build20230426",

0 commit comments

Comments
 (0)