Merge pull request #9 from libxengine/develop

V2.7.2.1001 Merge

CHANGELOG

@@ -1,3 +1,11 @@
+XEngine_Authorize V2.7.2.1001
+
+修改:makefile现在支持macos了
+更新:支持xengine v7.38版本了
+
+modify:makefile support macos now
+update:match xengine v7.38
+======================================================================================
 XEngine_Authorize V2.7.1.1001
 
 修正:读取CDKEY失败的问题

README.en.md

@@ -1,6 +1,7 @@
 [中文](README.md) ||  [English](README.en.md)  
 # XEngine_Authorize
 This repository has a development and master branch. If you want to use it, please use the master branch  
+As long as the repository is not in a suspended state, someone will maintain and develop it all the time, please use it with confidence  
 
 ## Introduction
 c c++网络验证服务器 网络授权服务器  
@@ -27,29 +28,30 @@ feature list:
 
 ## install
 
-#### Requirements
-support system above windows 7sp1 and linux(ubuntu20.04,centos8)  
-you must install XEngine,need V7.28 or above  
-
-#### Windows
-Just Run it.,use XEngine_AuthorizeApp
-
-#### Linux
-Run it on the terminal,use XEngine_AuthorizeService
-
-## complie
-install XEngine can be refer to xengine Readme docment  
+#### 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  
+use vs open and compile,suport windows 7sp1 and above  
+Just Run it,use XEngine_AuthorizeApp
 
 #### Linux
-Linux use Makefile complie  
-UBUNTU20.04 x64 or CENTOS8 x64  
+use makefile compile,UBUNTU20.04 x64 or CENTOS8 x64  
+Run it on the terminal,use XEngine_AuthorizeService
+
+#### Macos
+use makefile compile,mac 12 and above  
+Run it on the terminal,use XEngine_AuthorizeService
 
-##### Screenshot of the program
+##### compile command
 execute command in XEngine_Source path   
 make complie  
 make FLAGS=InstallAll Install File  

README.md

@@ -1,6 +1,7 @@
 [中文](README.md) ||  [English](README.en.md)  
 # XEngine_Authorize
 本仓库有开发和主分支,如果要使用,请使用master分支下的代码  
+只要仓库不是在暂停状态,那么就会有人一直维护和开发,请放心使用  
 
 ## 介绍
 c c++网络验证服务器 网络授权服务器  
@@ -27,27 +28,28 @@ c c++network Authorize service
 
 ## 安装教程
 
-#### 版本需求
-支持WINDOWS 7SP1和LINUX(UBUNT20.04,CENTOS8)以上系统  
-必须安装XEngine,版本需要V7.28或者以上版本    
+#### 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打开并且编译,支持WINDOWS 7SP1以上系统  
 直接运行即可,使用XEngine_AuthorizeApp
 
 #### Linux
+Linux使用Makefile编译,UBUNTU20.04 x64或者CENTOS8 x64  
 在控制台运行,使用XEngine_AuthorizeService
 
-## 编译
-安装XEngine可以参考其Readme文档  
-GITEE:https://gitee.com/xyry/libxengine  
-GITHUB:https://github.com/libxengine/xengine
-
-#### Windows
-使用VS打开并且编译  
-
-#### Linux
-Linux使用Makefile编译  
-UBUNTU20.04 x64或者CENTOS8 x64均可  
+#### Macos
+使用makefile编译,控制台运行,需要mac 12以及以上版本  
+在控制台运行,使用XEngine_AuthorizeService
 
 ##### 编译命令
 在XEngine_Source目录下执行命令  
@@ -84,7 +86,9 @@ make FLAGS=CleanAll 清理编译
 如果你有问题,可以在issues中提交
 
 ## 开发计划 
+mfc转qt界面库(我们需要会Qt的人员加入一起开发)  
 生成会话TOKEN分布式鉴权  
+支持OAuth验证  
 mysql支持  
 支持管理接口，用于网页版本  
 支持第三方用户密码验证  

XEngine_Source/AuthorizeModule_Configure/Makefile

@@ -1,20 +1,35 @@
 CC = g++ -Wall -std=c++17 -fPIC
+SHAREFLAG = -shared
+SHAREDLL = so
 RELEASE = 0
 UNICODE = 0
 INCLUDE = -I ./
 FILECENTOS = /etc/redhat-release
 LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib
 LIB = -lXEngine_BaseLib 
-LIBEX = -static-libgcc -lrt -ldl -lpthread
+LIBEX = -ldl -lpthread
 LOADSO = -Wl,-rpath=
 LIBINCLUDE = Configure_ini.o pch.o
 
+ifeq ($(OS),Windows_NT)
+	SHAREFLAG = 0
+else
+	ifeq ($(shell uname),Darwin)
+		SHAREDLL = dylib
+		SHAREFLAG = -dynamiclib
+		LOADSO = 
+	else
+		SHAREDLL = so
+		SHAREFLAG = -shared
+	endif
+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 +39,7 @@ UNICODE =
 endif
 
 all:$(LIBINCLUDE)
-	$(CC) $(DEBUG) $(LIBINCLUDE) -o libAuthorizeModule_Configure.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
+	$(CC) $(DEBUG) $(LIBINCLUDE) -o libAuthorizeModule_Configure.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
 
 Configure_ini.o:./Configure_ini/Configure_ini.cpp
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Configure_ini/Configure_ini.cpp
@@ -33,13 +48,13 @@ pch.o:pch.cpp
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) pch.cpp
 
 InstallAll:InstallSo
-InstallSo:./libAuthorizeModule_Configure.so
-	cp ./libAuthorizeModule_Configure.so ../../XEngine_Release/libAuthorizeModule_Configure.so
+InstallSo:./libAuthorizeModule_Configure.$(SHAREDLL)
+	cp ./libAuthorizeModule_Configure.$(SHAREDLL) ../../XEngine_Release/libAuthorizeModule_Configure.$(SHAREDLL)
 
 
 
 CleanAll:CleanObj CleanMk
 CleanObj:
 	rm *.o                                            
 CleanMk:
-	rm *.so                                           
+	rm *.$(SHAREDLL)                                           

XEngine_Source/AuthorizeModule_Database/Makefile

@@ -1,20 +1,35 @@
 CC = g++ -Wall -std=c++17 -fPIC
+SHAREFLAG = -shared
+SHAREDLL = so
 RELEASE = 0
 UNICODE = 0
 INCLUDE = -I ./
 FILECENTOS = /etc/redhat-release
 LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_HelpComponents
 LIB = -lXEngine_BaseLib -lHelpComponents_DataBase -lHelpComponents_Authorize
-LIBEX = -static-libgcc -lrt -ldl -lpthread
+LIBEX = -ldl -lpthread
 LOADSO = -Wl,-rpath=
 LIBINCLUDE = Database_SQLite.o pch.o
 
+ifeq ($(OS),Windows_NT)
+	SHAREFLAG = 0
+else
+	ifeq ($(shell uname),Darwin)
+		SHAREDLL = dylib
+		SHAREFLAG = -dynamiclib
+		LOADSO = 
+	else
+		SHAREDLL = so
+		SHAREFLAG = -shared
+	endif
+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 +39,7 @@ UNICODE =
 endif
 
 all:$(LIBINCLUDE)
-	$(CC) $(DEBUG) $(LIBINCLUDE) -o libAuthorizeModule_Database.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
+	$(CC) $(DEBUG) $(LIBINCLUDE) -o libAuthorizeModule_Database.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
 
 Database_SQLite.o:./Database_SQLite/Database_SQLite.cpp
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Database_SQLite/Database_SQLite.cpp
@@ -33,12 +48,12 @@ pch.o:pch.cpp
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) pch.cpp
 
 InstallAll:InstallSo
-InstallSo:./libAuthorizeModule_Database.so
-	cp ./libAuthorizeModule_Database.so ../../../XEngine_Release/libAuthorizeModule_Database.so
+InstallSo:./libAuthorizeModule_Database.$(SHAREDLL)
+	cp ./libAuthorizeModule_Database.$(SHAREDLL) ../../XEngine_Release/libAuthorizeModule_Database.$(SHAREDLL)
 
 
 CleanAll:CleanObj CleanMk
 CleanObj:
 	rm *.o                                            
 CleanMk:
-	rm *.so                                           
+	rm *.$(SHAREDLL)                                           

XEngine_Source/AuthorizeModule_Protocol/Makefile

@@ -1,20 +1,34 @@
 CC = g++ -Wall -std=c++17 -fPIC
+SHAREFLAG = -shared
+SHAREDLL = so
 RELEASE = 0
 UNICODE = 0
 INCLUDE = -I ./ -I ../XEngine_ThirdPart/jsoncpp
 FILECENTOS = /etc/redhat-release
 LOADBIN = -L ../XEngine_ThirdPart/jsoncpp
 LIB = -ljsoncpp
-LIBEX = -static-libgcc -lrt -ldl -lpthread
+LIBEX = -ldl -lpthread
 LOADSO = -Wl,-rpath=./,--disable-new-dtags
 LIBINCLUDE = Protocol_Packet.o Protocol_Parse.o pch.o
 
+ifeq ($(OS),Windows_NT)
+else
+	ifeq ($(shell uname),Darwin)
+		SHAREDLL = dylib
+		SHAREFLAG = -dynamiclib
+		LOADSO = 
+	else
+		SHAREDLL = so
+		SHAREFLAG = -shared
+	endif
+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 +38,7 @@ UNICODE =
 endif
 
 all:$(LIBINCLUDE)
-	$(CC) $(DEBUG) $(LIBINCLUDE) -o libAuthorizeModule_Protocol.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
+	$(CC) $(DEBUG) $(LIBINCLUDE) -o libAuthorizeModule_Protocol.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
 
 Protocol_Packet.o:./Protocol_Packet/Protocol_Packet.cpp
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Protocol_Packet/Protocol_Packet.cpp
@@ -35,13 +49,13 @@ pch.o:pch.cpp
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) pch.cpp
 
 InstallAll:InstallSo
-InstallSo:./libAuthorizeModule_Protocol.so
-	cp ./libAuthorizeModule_Protocol.so ../../XEngine_Release/libAuthorizeModule_Protocol.so
+InstallSo:./libAuthorizeModule_Protocol.$(SHAREDLL)
+	cp ./libAuthorizeModule_Protocol.$(SHAREDLL) ../../XEngine_Release/libAuthorizeModule_Protocol.$(SHAREDLL)
 
 
 
 CleanAll:CleanObj CleanMk
 CleanObj:
 	rm *.o                                            
 CleanMk:
-	rm *.so                                           
+	rm *.$(SHAREDLL)                                           

XEngine_Source/AuthorizeModule_Session/Makefile

@@ -1,20 +1,34 @@
 CC = g++ -Wall -std=c++17 -fPIC
+SHAREFLAG = -shared
+SHAREDLL = so
 RELEASE = 0
 UNICODE = 0
 INCLUDE = -I ./
 FILECENTOS = /etc/redhat-release
 LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib
 LIB = -lXEngine_BaseLib 
-LIBEX = -static-libgcc -lrt -ldl -lpthread
+LIBEX = -ldl -lpthread
 LOADSO = -Wl,-rpath=
 LIBINCLUDE = Session_Authorize.o pch.o
 
+ifeq ($(OS),Windows_NT)
+else
+	ifeq ($(shell uname),Darwin)
+		SHAREDLL = dylib
+		SHAREFLAG = -dynamiclib
+		LOADSO = 
+	else
+		SHAREDLL = so
+		SHAREFLAG = -shared
+	endif
+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 +38,7 @@ UNICODE =
 endif
 
 all:$(LIBINCLUDE)
-	$(CC) $(DEBUG) $(LIBINCLUDE) -o libAuthorizeModule_Session.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
+	$(CC) $(DEBUG) $(LIBINCLUDE) -o libAuthorizeModule_Session.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
 
 Session_Authorize.o:./Session_Authorize/Session_Authorize.cpp
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Session_Authorize/Session_Authorize.cpp
@@ -33,12 +47,12 @@ pch.o:pch.cpp
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) pch.cpp
 
 InstallAll:InstallSo 
-InstallSo:./libAuthorizeModule_Session.so
-	cp ./libAuthorizeModule_Session.so ../../../XEngine_Release/libAuthorizeModule_Session.so
+InstallSo:./libAuthorizeModule_Session.$(SHAREDLL)
+	cp ./libAuthorizeModule_Session.$(SHAREDLL) ../../XEngine_Release/libAuthorizeModule_Session.$(SHAREDLL)
 
 
 CleanAll:CleanObj CleanMk
 CleanObj:
 	rm *.o                                            
 CleanMk:
-	rm *.so                                           
+	rm *.$(SHAREDLL)