Merge pull request #4 from libxengine/develop

V1.3.1.1001 Merge

Author: xengine-qyt

CHANGELOG

@@ -1,3 +1,17 @@
+XEngine_ProxyServer V1.3.1.1001
+
+更新:匹配XEngine 7.38版本
+修改:现在支持MACOS系统了
+修改:linux和mac的构建名称
+修正:日志句柄打印错误
+修正:某些时候退出崩溃的问题
+
+update:match xengine v7.38 version
+modify:support macos now
+modify:linux and mac build name
+fixed:handle log printf is incorrent
+fixed:sometime is crashed when program exit
+======================================================================================
 XEngine_ProxyServer V1.3.0.1001
 
 添加:会话转发模块

README.en.md

@@ -23,32 +23,35 @@ this software support following features
 
 ## install
 
-#### Requirements  
-support system above windows 7sp1 and linux(ubuntu20.04,centos8)  
-XEngine need V7.27 or above  
+#### XEngine Evn
+you must install XEngine,need V7.38 or above,install XEngine can be refer to xengine Readme docment  
+GITEE:https://gitee.com/xyry/libxengine  
+GITHUB:https://github.com/libxengine/xengine
+
+##### fast to deployment 
+git clone https://gitee.com/xyry/libxengine.git or git clone https://github.com/libxengine/xengine.git  
+window Exection XEngine_WINEnv.bat   
+Linux Exection:sudo ./XEngine_LINEnv.sh -i 3  
+Macos Exection:./XEngine_LINEnv.sh -i 3
 
 #### Windows
-use vs open and complie  
-You need to configure the environment in the following way, otherwise you may need to set the library directory in the project yourself   
+use vs open and compile,suport windows 7sp1 and above  
+Just Run it,use XEngine_AuthorizeApp
 
 #### Linux
-Linux use Makefile to complie  
-supproted ubuntu x64 or centos x64     
+use makefile compile,UBUNTU20.04 x64 or CENTOS8 x64  
+Run it on the terminal
+
+#### Macos
+use makefile compile,mac 12 and above  
+Run it on the terminal
 
-##### XEngine Install
-you can install xengine env to your system by shell   
-like this:sudo XEngine_RunEnv.sh -i 3  
 ##### complie
 execute command in XEngine_Source path
 make complie  
 make FLAGS=InstallAll install  
 make FLAGS=CleanAll clear  
 
-#### XEngine Env
-install XEngine can be refer to xengine Readme docment  
-GITEE:https://gitee.com/xyry/libxengine  
-GITHUB:https://github.com/libxengine/xengine  
-
 #### use
 
 1.  Switch to the MASTER branch

README.md

@@ -23,29 +23,35 @@ c c++ Socks5 Proxy Service,HTTP Tunnel Proxy Service,tcp forward service
 
 ## 安装教程
 
-#### 版本需求
-支持WINDOWS 7SP1和LINUX(UBUNT20.04,CENTOS8)以上系统  
-XEngine版本需要V7.27或者以上版本  
+#### XEngine环境
+必须安装XEngine,版本需要V7.38或者以上版本,安装XEngine可以参考其Readme文档  
+GITEE:https://gitee.com/xyry/libxengine  
+GITHUB:https://github.com/libxengine/xengine
+
+###### 快速部署
+git clone https://gitee.com/xyry/libxengine.git 或者 git clone https://github.com/libxengine/xengine.git  
+window执行XEngine_WINEnv.bat 脚本.  
+Linux执行:sudo ./XEngine_LINEnv.sh -i 3  
+macos执行:./XEngine_LINEnv.sh -i 3  
 
 #### Windows
-使用VS打开并且编译
-你需要按照下面的方式配置环境,不然你可能需要自己在项目中设置库目录
+使用VS打开并且编译,支持WINDOWS 7SP1以上系统  
+直接运行即可,使用XEngine_AuthorizeApp
 
 #### Linux
-Linux使用Makefile编译  
-UBUNTU20.04 x64或者CENTOS8 x64均可  
+Linux使用Makefile编译,UBUNTU20.04 x64或者CENTOS8 x64  
+在控制台运行
+
+#### Macos
+使用makefile编译,控制台运行,需要mac 12以及以上版本  
+在控制台运行
 
 ##### 编译命令
 在XEngine_Source目录下执行命令
 make 编译  
 make FLAGS=InstallAll 安装库程序  
 make FLAGS=CleanAll 清理编译  
 
-#### XEngine环境
-安装XEngine可以参考其Readme文档  
-GITEE:https://gitee.com/xyry/libxengine  
-GITHUB:https://github.com/libxengine/xengine  
-
 #### 使用说明
 
 1.  切换到MASTER分支

XEngine_Docment/Docment_en.docx

@@ -27,6 +27,7 @@
     "tszAuthFile": "./XEngine_Config/UserList.txt"
   },
   "XVer": [
+    "1.3.1.1001 Build20220804",
     "1.3.0.1001 Build20220617",
     "1.2.0.1001 Build20220413",
     "1.1.0.1001 Build20211231",

XEngine_Docment/Docment_zh.docx

@@ -15,9 +15,6 @@ copy /y "%XEngine_Lib64%\x64\XEngine_RfcComponents\RfcComponents_ProxyProtocol.d
 copy /y "%XEngine_Lib64%\x64\XEngine_SystemSdk\XEngine_ProcFile.dll" "./"
 copy /y "%XEngine_Lib64%\x64\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
 
-copy /y "%XEngine_Lib64%\x64\XEngine_SystemSdk\XEngine_ProcFile.dll" "./"
-copy /y "%XEngine_Lib64%\x64\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
-
 copy /y "%XEngine_Lib64%\x64\XEngine_LibEx\libcrypto-3-x64.dll" "./"
 copy /y "%XEngine_Lib64%\x64\XEngine_LibEx\libssl-3-x64.dll" "./"
 copy /y "%XEngine_Lib64%\x64\XEngine_LibEx\libcurl.dll" "./"

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -15,9 +15,6 @@ copy /y "%XEngine_Lib32%\XEngine_RfcComponents\RfcComponents_ProxyProtocol.dll"
 copy /y "%XEngine_Lib32%\XEngine_SystemSdk\XEngine_ProcFile.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
 
-copy /y "%XEngine_Lib32%\XEngine_SystemSdk\XEngine_ProcFile.dll" "./"
-copy /y "%XEngine_Lib32%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
-
 copy /y "%XEngine_Lib32%\XEngine_LibEx\libcrypto-3.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_LibEx\libssl-3.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_LibEx\libcurl.dll" "./"

XEngine_Source/VSCopy-x64.bat

@@ -1,19 +1,30 @@
 CC = g++ -Wall -std=c++17 -fPIC
+SHAREFLAG = -shared
+SHAREDLL = so
 RELEASE = 0
 UNICODE = 0
 INCLUDE = -I ./
 LOADBIN = 
 LIB = 
-LIBEX = -static-libgcc -lrt -ldl -lpthread
+LIBEX = -ldl -lpthread
 LOADSO = -Wl,-rpath=
 LIBINCLUDE = ModuleAuthorize_User.o pch.o
 
+ifeq ($(shell uname),Darwin)
+	SHAREDLL = dylib
+	SHAREFLAG = -dynamiclib
+	LOADSO = 
+else
+	SHAREDLL = so
+	SHAREFLAG = -shared
+endif
+
 ifeq ($(RELEASE),1)
 FLAGS = -c -O2 
 DEBUG = 
 else
-FLAGS = -c -lc_p
-DEBUG = -g -pg 
+FLAGS = -c
+DEBUG = -g
 endif
 
 ifeq ($(UNICODE),1)
@@ -24,7 +35,7 @@ endif
 
 
 all:$(LIBINCLUDE)
-	$(CC) $(DEBUG) $(LIBINCLUDE) -o libXEngine_ModuleAuthorize.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
+	$(CC) $(DEBUG) $(LIBINCLUDE) -o libXEngine_ModuleAuthorize.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
 
 ModuleAuthorize_User.o:./ModuleAuthorize_User/ModuleAuthorize_User.cpp             
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./ModuleAuthorize_User/ModuleAuthorize_User.cpp 
@@ -34,12 +45,12 @@ pch.o:./pch.cpp
 
 
 InstallAll:InstallSo 
-InstallSo:./libXEngine_ModuleAuthorize.so
-	cp ./libXEngine_ModuleAuthorize.so ../../XEngine_Release/libXEngine_ModuleAuthorize.so
+InstallSo:./libXEngine_ModuleAuthorize.$(SHAREDLL)
+	cp ./libXEngine_ModuleAuthorize.$(SHAREDLL) ../../XEngine_Release/libXEngine_ModuleAuthorize.$(SHAREDLL)
 
 
 CleanAll:CleanObj CleanMk
 CleanObj:                                               
 	rm *.o
 CleanMk:                             
-	rm *.so                        
+	rm *.$(SHAREDLL)                        

XEngine_Source/VSCopy-x86.bat

@@ -1,19 +1,30 @@
 CC = g++ -Wall -std=c++17 -fPIC
+SHAREFLAG = -shared
+SHAREDLL = so
 RELEASE = 0
 UNICODE = 0
 INCLUDE = -I ./ -I ../XEngine_ThirdPart/jsoncpp
 LOADBIN = -L ../XEngine_ThirdPart/jsoncpp
 LIB = -ljsoncpp
-LIBEX = -static-libgcc -lrt -ldl -lpthread
+LIBEX = -ldl -lpthread
 LOADSO = -Wl,-rpath=./,--disable-new-dtags
 LIBINCLUDE = ModuleConfigure_Json.o pch.o
 
+ifeq ($(shell uname),Darwin)
+	SHAREDLL = dylib
+	SHAREFLAG = -dynamiclib
+	LOADSO = 
+else
+	SHAREDLL = so
+	SHAREFLAG = -shared
+endif
+
 ifeq ($(RELEASE),1)
 FLAGS = -c -O2 
 DEBUG = 
 else
-FLAGS = -c -lc_p
-DEBUG = -g -pg 
+FLAGS = -c 
+DEBUG = -g 
 endif
 
 ifeq ($(UNICODE),1)
@@ -24,7 +35,7 @@ endif
 
 
 all:$(LIBINCLUDE)
-	$(CC) $(DEBUG) $(LIBINCLUDE) -o libXEngine_ModuleConfigure.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
+	$(CC) $(DEBUG) $(LIBINCLUDE) -o libXEngine_ModuleConfigure.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
 
 ModuleConfigure_Json.o:./ModuleConfigure_Json/ModuleConfigure_Json.cpp             
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./ModuleConfigure_Json/ModuleConfigure_Json.cpp 
@@ -34,12 +45,12 @@ pch.o:./pch.cpp
 
 
 InstallAll:InstallSo 
-InstallSo:./libXEngine_ModuleConfigure.so
-	cp ./libXEngine_ModuleConfigure.so ../../XEngine_Release/libXEngine_ModuleConfigure.so
+InstallSo:./libXEngine_ModuleConfigure.$(SHAREDLL)
+	cp ./libXEngine_ModuleConfigure.$(SHAREDLL) ../../XEngine_Release/libXEngine_ModuleConfigure.$(SHAREDLL)
 
 
 CleanAll:CleanObj CleanMk
 CleanObj:                                               
 	rm *.o
 CleanMk:                             
-	rm *.so                        
+	rm *.$(SHAREDLL)