Merge pull request #6 from libxengine/develop

V2.1 Merge

Author: xengine-qyt

README.en.md

@@ -22,7 +22,7 @@ this software support following features
 7. load balanc(planning)  
 8. message get time  
 9. message subcribe  
-10. support Permission Validation(planning)  
+10. support Permission Validation  
 11. support multi protocol(TCP,HTTP,WEBSOCKET)  
 12. Active delivery acquisition mode or passive subscription notification module  
 13. get order and start serial pos setting  
@@ -33,7 +33,7 @@ this software support following features
 
 #### Requirements  
 support system above windows 7sp1 and linux(ubuntu20.04,centos8)  
-XEngine need V7.18 or above  
+XEngine need V7.23 or above  
 vcpkg need 2021.05.11 or above  
 
 #### Windows
@@ -46,11 +46,6 @@ vcpkg.exe install jsoncpp
 vcpkg integrate install  
 you can not use vcpkg and config jsoncpp development for youself   
 
-##### XEngine
-XEngine can be download with mine repository,whe you downloaded xengine,you have to add value to you user environment  
-- XEngine_Include header file path
-- XEngine_Library library file path
-
 #### Linux
 Linux use Makefile to complie  
 supproted ubuntu x64 or centos x64     
@@ -71,6 +66,11 @@ 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
@@ -89,6 +89,10 @@ make FLAGS=CleanAll clear
 ## other problems   
 You can refer to the document under the docment directory. It contains API protocol and service description.  
 
+## Test Server Address
+Address:app.xyry.org or 159.75.200.173  
+Port:TCP 5200,HTTP 5201,WEBSOCKET 5202  
+
 ## Participate in contribution
 
 1. Fork this code

README.md

@@ -21,7 +21,7 @@ c c++Message Service
 7. 负载均衡(planning)  
 8. 消息次数  
 9. 消息订阅  
-10. 支持权限验证(planning)  
+10. 支持权限验证  
 11. 支持多种协议(TCP,HTTP,WEBSOCKET)  
 12. 主动投递获取模式或者被动订阅通知模块  
 13. 获取顺序与开始序列号设置  
@@ -32,7 +32,7 @@ c c++Message Service
 
 #### 版本需求
 支持WINDOWS 7SP1和LINUX(UBUNT20.04,CENTOS8)以上系统  
-XEngine版本需要V7.18或者以上版本  
+XEngine版本需要V7.23或者以上版本  
 vcpkg 需要2021.05.11以上版本  
 
 #### Windows
@@ -45,11 +45,6 @@ vcpkg 需要2021.05.11以上版本
 集成VS环境: vcpkg integrate install  
 vcpkg 主要为了方便安装jsoncpp,如果你想自己配置jsoncpp的环境,可以不使用vcpkg...  
 
-##### XEngine环境
-XEngine可以直接下载,下载完毕后添加用户环境变量,需要下面两个  
-- XEngine_Include 指向头文件目录地址
-- XEngine_Library 指向库文件目录地址
-
 #### Linux
 Linux使用Makefile编译  
 UBUNTU20.04 x64或者CENTOS8 x64均可  
@@ -60,14 +55,17 @@ sudo apt install libjsoncpp-devel
 Centos8.x  
 sudo dnf install jsoncpp-devel  
 
-##### XEngine环境
-XEngine可以通过脚本文件安装sudo XEngine_RunEnv.sh -i 3
 ##### 编译命令
 在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分支
@@ -86,6 +84,10 @@ make FLAGS=CleanAll 清理编译
 ## 其他问题  
 你可以参考docment目录下的文档.里面包含了API协议和服务说明.
 
+## 测试服务器
+地址:app.xyry.org 或者 159.75.200.173  
+端口:TCP 5200,HTTP 5201,WEBSOCKET 5202  
+
 ## 参与贡献
 
 1.  Fork 本仓库

XEngine_Apps/MQCore_HTTPApp/MQCore_HTTPApp.cpp

@@ -27,7 +27,37 @@
 
 SOCKET m_Socket;
 LPCTSTR lpszKey = _T("XEngine_Notify");  //主题
-LPCTSTR lpszPostUrl = _T("http://192.168.1.7:5201");
+LPCTSTR lpszPostUrl = _T("http://127.0.0.1:5201");
+
+void MQ_Authorize()
+{
+	int nLen = 0;
+	TCHAR tszMsgBuffer[2048];
+	memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
+
+	Json::Value st_JsonRoot;
+	Json::Value st_JsonAuth;
+	st_JsonRoot["unOperatorType"] = ENUM_XENGINE_COMMUNICATION_PROTOCOL_TYPE_AUTH;
+	st_JsonRoot["unOperatorCode"] = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_AUTH_REQLOGIN;
+	st_JsonRoot["byVersion"] = ENUM_XENGINE_PROTOCOLHDR_PAYLOAD_TYPE_JSON;
+
+	st_JsonAuth["tszUserName"] = "123123aa";
+	st_JsonAuth["tszUserPass"] = "123123";
+
+	st_JsonRoot["st_Auth"] = st_JsonAuth;
+
+	nLen = st_JsonRoot.toStyledString().length();
+	memcpy(tszMsgBuffer, st_JsonRoot.toStyledString().c_str(), nLen);
+
+	TCHAR* ptszMsgBody = NULL;
+	if (!APIHelp_HttpRequest_Post(lpszPostUrl, tszMsgBuffer, NULL, &ptszMsgBody))
+	{
+		printf("发送投递失败！\n");
+		return;
+	}
+	printf("MQ_Authorize:%s\n", ptszMsgBody);
+	BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBody);
+}
 
 void MQ_Create()
 {
@@ -198,6 +228,7 @@ int main()
 	WSAStartup(MAKEWORD(2, 2), &st_WSAData);
 #endif
 
+	MQ_Authorize();
 	MQ_Create();
 	MQ_Post("123hello");
 	MQ_GetNumber();

XEngine_Apps/MQCore_TCPApp/MQCore_TCPApp.cpp

@@ -2,6 +2,7 @@
 #include <Windows.h>
 #include <tchar.h>
 #pragma comment(lib,"Ws2_32.lib")
+#pragma comment(lib,"x86/XEngine_BaseLib/XEngine_BaseLib.lib")
 #pragma comment(lib,"x86/XEngine_Client/XClient_Socket.lib")
 #else
 #include <stdio.h>
@@ -12,6 +13,8 @@
 using namespace std;
 #include <XEngine_Include/XEngine_CommHdr.h>
 #include <XEngine_Include/XEngine_ProtocolHdr.h>
+#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
+#include <XEngine_Include/XEngine_BaseLib/Algorithm_Error.h>
 #include <XEngine_Include/XEngine_Client/XClient_Define.h>
 #include <XEngine_Include/XEngine_Client/XClient_Error.h>
 #include "../../XEngine_Source/XQueue_ProtocolHdr.h"
@@ -21,6 +24,53 @@ SOCKET m_Socket;
 __int64x nLastNumber = 0;
 LPCTSTR lpszKey = _T("XEngine_Notify");  //主题
 
+void MQ_Authorize()
+{
+	int nLen = 0;
+	XENGINE_PROTOCOLHDR st_ProtocolHdr;
+	XENGINE_PROTOCOL_USERAUTH st_ProtocolAuth;
+	TCHAR tszMsgBuffer[2048];
+
+	memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
+	memset(&st_ProtocolHdr, '\0', sizeof(XENGINE_PROTOCOLHDR));
+	memset(&st_ProtocolAuth, '\0', sizeof(XENGINE_PROTOCOL_USERAUTH));
+
+	st_ProtocolHdr.wHeader = XENGIEN_COMMUNICATION_PACKET_PROTOCOL_HEADER;
+	st_ProtocolHdr.unOperatorType = ENUM_XENGINE_COMMUNICATION_PROTOCOL_TYPE_AUTH;
+	st_ProtocolHdr.unOperatorCode = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_AUTH_REQLOGIN;
+	st_ProtocolHdr.byVersion = 1;
+	st_ProtocolHdr.byIsReply = TRUE;           //获得处理返回结果
+	st_ProtocolHdr.wTail = XENGIEN_COMMUNICATION_PACKET_PROTOCOL_TAIL;
+
+	_tcscpy(st_ProtocolAuth.tszUserName, "123123aa");
+	_tcscpy(st_ProtocolAuth.tszUserPass, "123123");
+
+	st_ProtocolHdr.unPacketSize = sizeof(XENGINE_PROTOCOL_USERAUTH);
+
+	nLen = sizeof(XENGINE_PROTOCOLHDR) + st_ProtocolHdr.unPacketSize;
+	memcpy(tszMsgBuffer, &st_ProtocolHdr, sizeof(XENGINE_PROTOCOLHDR));
+	memcpy(tszMsgBuffer + sizeof(XENGINE_PROTOCOLHDR), &st_ProtocolAuth, sizeof(XENGINE_PROTOCOL_USERAUTH));
+
+	if (!XClient_TCPSelect_SendMsg(m_Socket, tszMsgBuffer, nLen))
+	{
+		printf("发送投递失败！\n");
+		return;
+	}
+	nLen = 0;
+	TCHAR* ptszMsgBuffer;
+	memset(&st_ProtocolHdr, '\0', sizeof(XENGINE_PROTOCOLHDR));
+	if (!XClient_TCPSelect_RecvPkt(m_Socket, &ptszMsgBuffer, &nLen, &st_ProtocolHdr))
+	{
+		printf("接受数据失败！\n");
+		return;
+	}
+	printf("%d\n", st_ProtocolHdr.wReserve);
+	if (nLen > 0)
+	{
+		BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
+	}
+}
+
 void MQ_Create()
 {
 	int nLen = 0;
@@ -434,6 +484,7 @@ int main(int argc, char** argv)
 	}
 	printf("连接成功！\n");
 
+	//MQ_Authorize();
 	if (argc > 1)
 	{
 		MQ_Create();

XEngine_Apps/MQCore_WSApp/MQCore_WSApp.cpp

@@ -63,6 +63,42 @@ BOOL MQ_RecvPacket(TCHAR* ptszMsgBuffer, int* pInt_MsgLen)
 	*pInt_MsgLen = nRVLen;
 	return TRUE;
 }
+
+void MQ_Authorize()
+{
+	int nLen = 0;
+	TCHAR tszMsgBuffer[2048];
+	memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
+
+	Json::Value st_JsonRoot;
+	Json::Value st_JsonAuth;
+	st_JsonRoot["unOperatorType"] = ENUM_XENGINE_COMMUNICATION_PROTOCOL_TYPE_AUTH;
+	st_JsonRoot["unOperatorCode"] = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_AUTH_REQLOGIN;
+	st_JsonRoot["byVersion"] = ENUM_XENGINE_PROTOCOLHDR_PAYLOAD_TYPE_JSON;
+
+	st_JsonAuth["tszUserName"] = "123123aa";
+	st_JsonAuth["tszUserPass"] = "123123";
+
+	st_JsonRoot["st_Auth"] = st_JsonAuth;
+
+	nLen = st_JsonRoot.toStyledString().length();
+	memcpy(tszMsgBuffer, st_JsonRoot.toStyledString().c_str(), nLen);
+
+	if (!MQ_SendPacket(tszMsgBuffer, nLen))
+	{
+		printf("发送投递失败！\n");
+		return;
+	}
+	nLen = 2048;
+	memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
+	if (!MQ_RecvPacket(tszMsgBuffer, &nLen))
+	{
+		printf("接受数据失败！\n");
+		return;
+	}
+	printf("MQ_Authorize:%s\n", tszMsgBuffer);
+}
+
 void MQ_Create()
 {
 	int nLen = 0;
@@ -341,7 +377,7 @@ int main()
 		printf("RfcComponents_WSConnector_Connect:%lX", WSFrame_GetLastError());
 		return -1;
 	}
-	if (!XClient_TCPSelect_Create(&m_Socket, _T("192.168.1.7"), 5202))
+	if (!XClient_TCPSelect_Create(&m_Socket, _T("127.0.0.1"), 5202))
 	{
 		printf("NetClient_TCPSelect_Create:%lX", XClient_GetLastError());
 		return -1;
@@ -370,7 +406,7 @@ int main()
 	{
 		printf("%s\n", tszMsgBuffer + nPos);
 	}
-	
+	MQ_Authorize();
 	MQ_Create();
 	MQ_Post("123hello");
 	MQ_GetSerial();