Merge pull request #9 from libxengine/develop

V3.2.0.1001 Merge

Author: xengine-qyt

CHANGELOG

@@ -1,3 +1,25 @@
+XEngine_MQService V3.2.0.1001
+
+添加:为会话模块添加心跳
+添加:打印XEngine版本功能
+修改:http现在也支持心跳协议了
+修改:移动会话超时函数到网络文件下
+修改:现在回调函数拥有更多参数
+修改:现在支持MACOS系统了
+更新:匹配XEngine V7.38版本
+删除:套接字超时功能
+删除:会话模块重复的函数
+
+added:heart active for session module
+added:xengine version printf
+modify:support heartbeat for Http
+modify:move session timeout to net.cpp
+modify:support macos now
+update:match xengine version 7.38
+delete:socket timeout
+delete:repeated function for session module
+modify:callback function has more parament
+======================================================================================
 XEngine_MQService V3.1.0.1001
 
 添加:为HTTP会话ID支持

README.en.md

@@ -1,6 +1,7 @@
 [中文](README.md) ||  [English](README.en.md)  
 # XEngine_MQService
 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 suspended state, we will maintain and develop it all the time, please use it with confidence
 
 #### Description
 c c++消息服务 消息中间件
@@ -32,32 +33,34 @@ this software support following features
 
 ## install
 
-#### Requirements  
-support system above windows 7sp1 and linux(ubuntu20.04,centos8)  
-XEngine need V7.23 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 complie,support windows 7sp1 and above   
+Just Run it.
 
 #### Linux
 Linux use Makefile to complie  
-supproted ubuntu x64 or centos x64     
+supproted ubuntu x64 or centos x64  
+
+#### MacOS
+Linux use Makefile to complie,terminal exection,Requires mac 12 and above  
 
-##### 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

@@ -1,6 +1,7 @@
 [中文](README.md) ||  [English](README.en.md)  
 # XEngine_MQService
 本仓库有开发和主分支,如果要使用,请使用master分支下的代码  
+只要仓库不是在暂停状态,那么就会有人一直维护和开发,请放心使用
 
 ## 介绍
 c c++消息服务 消息中间件  
@@ -31,29 +32,36 @@ c c++Message Service
 
 ## 安装教程
 
-#### 版本需求
-支持WINDOWS 7SP1和LINUX(UBUNT20.04,CENTOS8)以上系统  
-XEngine版本需要V7.30或者以上版本  
+#### 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以上系统  
+直接运行即可
 
 #### Linux
 Linux使用Makefile编译  
 UBUNTU20.04 x64或者CENTOS8 x64均可  
+在控制台运行
+
+#### MacOS
+使用makefile编译,控制台运行,需要mac 12以及以上版本  
+在控制台运行
 
 ##### 编译命令
-在XEngine_Source目录下执行命令
+在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分支
@@ -87,11 +95,10 @@ GITHUB:https://github.com/libxengine/xengine
 如果你觉得这个软件对你有帮助,请你给我们一个START吧
 
 ## 开发计划
-自动移除超时客户端  
+DDS消息订阅与发布  
 扩展获取消息的内容  
 消息属性生效  
 删除包协议  
-Session支持  
 
 ## 提交问题
 

XEngine_Docment/Docment_en.docx

@@ -17,12 +17,7 @@
         "nWSThread":2
     },
     "XTime":{
-        "bHBTime":0,
         "nDBMonth":3,
-        "nTimeCheck":3,
-        "nTCPTimeOut":5,
-        "nHttpTimeOut":5,
-        "nWSTimeOut":5,
         "nSessionTime":60
     },
     "XLog":{
@@ -37,6 +32,7 @@
         "SQLPass":"123123Ruiyue"
     },
     "XVer":[
+        "3.2.0.1001 Build20220715",
         "3.1.0.1001 Build20220408",
         "3.0.0.1001 Build20220318",
         "2.1.0.1001 Build20211119",

XEngine_Docment/Docment_zh.docx

@@ -34,12 +34,7 @@ typedef struct tag_XEngine_ServerConfig
     }st_XMax;
     struct
     {
-        BOOL bHBTime;
         int nDBMonth;
-        int nTimeCheck;
-        int nTCPTimeOut;
-        int nHttpTimeOut;
-        int nWSTimeOut;
         int nSessionTime;
     }st_XTime;
     struct

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -86,19 +86,14 @@ BOOL CConfig_Json::Config_Json_File(LPCTSTR lpszConfigFile,XENGINE_SERVERCONFIG
     pSt_ServerConfig->st_XMax.nHttpThread = st_JsonXMax["nHttpThread"].asInt();
     pSt_ServerConfig->st_XMax.nWSThread = st_JsonXMax["nWSThread"].asInt();
 
-    if (st_JsonRoot["XTime"].empty() || (7 != st_JsonRoot["XTime"].size()))
+    if (st_JsonRoot["XTime"].empty() || (2 != st_JsonRoot["XTime"].size()))
     {
         Config_IsErrorOccur = TRUE;
         Config_dwErrorCode = ERROR_MQ_MODULE_CONFIG_JSON_XTIME;
         return FALSE;
     }
     Json::Value st_JsonXTime = st_JsonRoot["XTime"];
-    pSt_ServerConfig->st_XTime.bHBTime = st_JsonXTime["bHBTime"].asInt();
     pSt_ServerConfig->st_XTime.nDBMonth = st_JsonXTime["nDBMonth"].asInt();
-    pSt_ServerConfig->st_XTime.nTimeCheck = st_JsonXTime["nTimeCheck"].asInt();
-    pSt_ServerConfig->st_XTime.nTCPTimeOut = st_JsonXTime["nTCPTimeOut"].asInt();
-    pSt_ServerConfig->st_XTime.nHttpTimeOut = st_JsonXTime["nHttpTimeOut"].asInt();
-    pSt_ServerConfig->st_XTime.nWSTimeOut = st_JsonXTime["nWSTimeOut"].asInt();
     pSt_ServerConfig->st_XTime.nSessionTime = st_JsonXTime["nSessionTime"].asInt();
 
     if (st_JsonRoot["XLog"].empty() || (3 != st_JsonRoot["XLog"].size()))

XEngine_Source/MQCore_ConfigModule/Config_Define.h

@@ -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 = Config_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 libMQCore_ConfigModule.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
+	$(CC) $(DEBUG) $(LIBINCLUDE) -o libMQCore_ConfigModule.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
 
 Config_Json.o:./Config_Json/Config_Json.cpp             
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Config_Json/Config_Json.cpp 
@@ -34,12 +45,12 @@ pch.o:./pch.cpp
 
 
 InstallAll:InstallSo 
-InstallSo:./libMQCore_ConfigModule.so
-	cp ./libMQCore_ConfigModule.so ../../XEngine_Release/libMQCore_ConfigModule.so
+InstallSo:./libMQCore_ConfigModule.$(SHAREDLL)
+	cp ./libMQCore_ConfigModule.so ../../XEngine_Release/libMQCore_ConfigModule.$(SHAREDLL)
 
 
 CleanAll:CleanObj CleanMk
 CleanObj:                                               
 	rm *.o
 CleanMk:                             
-	rm *.so                        
+	rm *.$(SHAREDLL)                        

XEngine_Source/MQCore_ConfigModule/Config_Json/Config_Json.cpp

@@ -1,19 +1,30 @@
 CC = g++ -Wall -std=c++17 -fPIC
+SHAREFLAG = -shared
+SHAREDLL = so
 RELEASE = 0
 UNICODE = 0
 INCLUDE = -I ./ 
 LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_HelpComponents
 LIB = -lHelpComponents_DataBase
-LIBEX = -static-libgcc -lrt -ldl -lpthread
+LIBEX = -ldl -lpthread
 LOADSO = -Wl,-rpath=./,--disable-new-dtags
 LIBINCLUDE = DBModule_MQData.o DBModule_MQUser.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 libMQCore_DBModule.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
+	$(CC) $(DEBUG) $(LIBINCLUDE) -o libMQCore_DBModule.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
 
 DBModule_MQData.o:./DBModule_MQData/DBModule_MQData.cpp             
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./DBModule_MQData/DBModule_MQData.cpp 
@@ -36,12 +47,12 @@ pch.o:./pch.cpp
 
 
 InstallAll:InstallSo 
-InstallSo:./libMQCore_DBModule.so
-	cp ./libMQCore_DBModule.so ../../XEngine_Release/libMQCore_DBModule.so
+InstallSo:./libMQCore_DBModule.$(SHAREDLL)
+	cp ./libMQCore_DBModule.so ../../XEngine_Release/libMQCore_DBModule.$(SHAREDLL)
 
 
 CleanAll:CleanObj CleanMk
 CleanObj:                                               
 	rm *.o
 CleanMk:                             
-	rm *.so                        
+	rm *.$(SHAREDLL)