Skip to content

Commit 0595f2f

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #19 from libxengine/develop
V3.11.0.1001 Merge
2 parents 292be9c + bad881c commit 0595f2f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+931
-7782
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Screenshots**
24+
If applicable, add screenshots to help explain your problem.
25+
26+
**Desktop (please complete the following information):**
27+
- OS: [e.g. iOS]
28+
- Browser [e.g. chrome, safari]
29+
- Version [e.g. 22]
30+
31+
**Smartphone (please complete the following information):**
32+
- Device: [e.g. iPhone6]
33+
- OS: [e.g. iOS8.1]
34+
- Browser [e.g. stock browser, safari]
35+
- Version [e.g. 22]
36+
37+
**Additional context**
38+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "XEngine_Source/XEngine_Depend"]
2+
path = XEngine_Source/XEngine_Depend
3+
url = https://github.com/libxengine/XEngine_OPenSource.git

‎CHANGELOG‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
XEngine_MQService V3.11.0.1001
2+
3+
增加:MQTT协议服务支持
4+
增加:信息报告支持
5+
修改:jsoncpp模块使用git的子模块替换
6+
修改:分离了版本列表从主配置中
7+
修改:增加了日志的路径配置
8+
修改:信号量有提示了
9+
修改:保存时间配置移动到db配置
10+
修正:日志配置没有效果的问题
11+
修正:关闭客户端处理不正确
12+
修正:绑定消息日志提示不正确
13+
14+
added:mqtt protocol service supported
15+
added:info report supported
16+
modify:jsoncpp module use git submodule instead
17+
modify:detach version list from main configure
18+
modify:added file path of log configure
19+
modify:signal have tips
20+
modify:save time configure move to db configure
21+
fixed:log configure is not work
22+
fixed:close client is incorrect
23+
fixed:bind log print is incorrect
24+
======================================================================================
125
XEngine_MQService V3.10.0.1001
226

327
增加:消息属性增加无限制消息获取

‎CODE_OF_CONDUCT.md‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, religion, or sexual identity
10+
and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the
26+
overall community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email
35+
address, without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
[email protected].
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Correction
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A private, written warning from community leaders, providing
80+
clarity around the nature of the violation and an explanation of why the
81+
behavior was inappropriate. A public apology may be requested.
82+
83+
### 2. Warning
84+
85+
**Community Impact**: A violation through a single incident or series
86+
of actions.
87+
88+
**Consequence**: A warning with consequences for continued behavior. No
89+
interaction with the people involved, including unsolicited interaction with
90+
those enforcing the Code of Conduct, for a specified period of time. This
91+
includes avoiding interactions in community spaces as well as external channels
92+
like social media. Violating these terms may lead to a temporary or
93+
permanent ban.
94+
95+
### 3. Temporary Ban
96+
97+
**Community Impact**: A serious violation of community standards, including
98+
sustained inappropriate behavior.
99+
100+
**Consequence**: A temporary ban from any sort of interaction or public
101+
communication with the community for a specified period of time. No public or
102+
private interaction with the people involved, including unsolicited interaction
103+
with those enforcing the Code of Conduct, is allowed during this period.
104+
Violating these terms may lead to a permanent ban.
105+
106+
### 4. Permanent Ban
107+
108+
**Community Impact**: Demonstrating a pattern of violation of community
109+
standards, including sustained inappropriate behavior, harassment of an
110+
individual, or aggression toward or disparagement of classes of individuals.
111+
112+
**Consequence**: A permanent ban from any sort of public interaction within
113+
the community.
114+
115+
## Attribution
116+
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.0, available at
119+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
120+
121+
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122+
enforcement ladder](https://github.com/mozilla/diversity).
123+
124+
[homepage]: https://www.contributor-covenant.org
125+
126+
For answers to common questions about this code of conduct, see the FAQ at
127+
https://www.contributor-covenant.org/faq. Translations are available at
128+
https://www.contributor-covenant.org/translations.

‎README.en.md‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ c c++Message Queue Service
1010
#### Software Architecture
1111
the software developed based on xengine,using c/c++ development
1212
the software is a simple and high performance server,Allow users to use it directly without secondary development
13-
the software mainly provides a message queue and dds engine,support http,WEBSOCKET and private protocol api server
13+
the software mainly provides a message queue and dds engine,support http,WEBSOCKET,MQTT and private protocol api server
1414

1515
## Software features
1616
this software support following features
@@ -24,7 +24,7 @@ this software support following features
2424
8. message get time
2525
9. message subcribe
2626
10. support Permission Validation
27-
11. support multi protocol(TCP,WEBSOCKET)
27+
11. support multi protocol(TCP,WEBSOCKET,MQTT)
2828
12. Active delivery acquisition mode or passive subscription notification module
2929
13. get order and start serial pos setting
3030
14. Unlimited load message types
@@ -37,7 +37,7 @@ this software support following features
3737
## install
3838

3939
#### XEngine Evn
40-
you must install XEngine,need V8.15 or above,install XEngine can be refer to xengine Readme docment
40+
you must install XEngine,need V8.31 or above,install XEngine can be refer to xengine Readme docment
4141
GITEE:https://gitee.com/xyry/libxengine
4242
GITHUB:https://github.com/libxengine/xengine
4343

@@ -47,6 +47,15 @@ window Exection XEngine_WINEnv.bat
4747
Linux Exection:sudo ./XEngine_LINEnv.sh -i 3
4848
Macos Exection:./XEngine_LINEnv.sh -i 3
4949

50+
##### Depends on environment
51+
Requires MYSQL service support, execute XEngine_SQLFile/CreateDatabase.sql to create database
52+
Execute XEngine_SQLFile/XEngine_MQData.sql and XEngine_SQLFile/XEngine_MQUser.sql to create the table
53+
54+
#### sub module
55+
Due to the dependent sub-modules, after you checkout the warehouse, execute the following command in the warehouse directory to pull the sub-modules
56+
git submodule init
57+
git submodule update
58+
5059
#### Windows
5160
use vs open and complie,support windows 7sp1 and above
5261
Just Run it.
@@ -71,7 +80,6 @@ same linux
7180
## Installation Instructions
7281
#### Install
7382
Modify the configuration file to what you need, and then run the service directly
74-
need to mysql service support,create database through CreateDatabase.sql,import XEngine_SQLFile/XEngine_MQData.sql and XEngine_SQLFile/XEngine_MQUser.sql to create table.
7583

7684
#### upgrade
7785
If it is an upgrade installation, after downloading the new version and modifying the configuration file, it can be run directly

‎README.md‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ c c++Message Service
1010
## 软件架构
1111
此软件基于XEngine开发.采用C/C++作为开发语言
1212
此软件是一款简易的高性能服务,统一的API接口,让用户几乎不需要二次开发就可以直接使用
13-
此软件主要是提供了消息队列与消息分发引擎,可用于用户消息操作的一个API服务器.支持HTTP,WEBSOCKET和私有协议.
13+
此软件主要是提供了消息队列与消息分发引擎,可用于用户消息操作的一个API服务器.支持HTTP,WEBSOCKET,MQTT和私有协议.
1414
## 软件特性
1515
此软件支持以下特性
1616
1. 消息序列
@@ -23,7 +23,7 @@ c c++Message Service
2323
8. 消息次数
2424
9. 消息订阅
2525
10. 支持权限验证
26-
11. 支持多种协议(TCP,WEBSOCKET)
26+
11. 支持多种协议(TCP,WEBSOCKET,MQTT)
2727
12. 主动投递获取模式或者被动订阅通知模块
2828
13. 获取顺序与开始序列号设置
2929
14. 不限制负载的消息类型
@@ -36,7 +36,7 @@ c c++Message Service
3636
## 安装教程
3737

3838
#### XEngine环境
39-
必须安装XEngine,版本需要V8.15或者以上版本,安装XEngine可以参考其Readme文档
39+
必须安装XEngine,版本需要V8.31或者以上版本,安装XEngine可以参考其Readme文档
4040
GITEE:https://gitee.com/xyry/libxengine
4141
GITHUB:https://github.com/libxengine/xengine
4242

@@ -50,6 +50,11 @@ macos执行:./XEngine_LINEnv.sh -i 3
5050
需要MYSQL服务的支持,执行XEngine_SQLFile/CreateDatabase.sql 创建数据库
5151
分别执行:执行XEngine_SQLFile/XEngine_MQData.sql 和 执行XEngine_SQLFile/XEngine_MQUser.sql 创建表
5252

53+
#### sub module
54+
由于依赖的子模块,在你checkout仓库后,在仓库目录下执行下面的命令拉取子模块
55+
git submodule init
56+
git submodule update
57+
5358
#### Windows
5459
使用VS打开并且编译,支持WINDOWS 7SP1以上系统
5560
直接运行即可
@@ -77,7 +82,6 @@ make FLAGS=CleanAll 清理编译
7782
## 安装指导
7883
#### 安装
7984
修改配置文件为你需要的,然后直接运行服务即可
80-
需要MYSQL服务,使用CreateDatabase.sql创建数据库,然后导入执行XEngine_SQLFile/XEngine_MQData.sql 和 执行XEngine_SQLFile/XEngine_MQUser.sql 创建表
8185

8286
#### 升级
8387
如果是升级安装,下载新版本后修改配置文件就可以直接运行了

‎SECURITY.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
| Version | Supported |
6+
| ------- | ------------------ |
7+
| >= 3.x | :white_check_mark: |
8+
| <= 2.x | :x: |
9+
10+
## Reporting a Vulnerability
11+
12+
www.xyry.org or [email protected]

‎XEngine_Apps/MQCore_HTTPApp/MQCore_HTTPApp.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#ifdef _MSC_BUILD
22
#include <Windows.h>
33
#include <tchar.h>
4-
#include <json/json.h>
54
#pragma comment(lib,"Ws2_32")
65
#pragma comment(lib,"x86/XEngine_BaseLib/XEngine_BaseLib")
76
#pragma comment(lib,"x86/XEngine_Client/XClient_APIHelp")
@@ -10,7 +9,6 @@
109
#include <stdio.h>
1110
#include <stdlib.h>
1211
#include <string.h>
13-
#include <json/json.h>
1412
#include <XEngine_Include/XEngine_CommHdr.h>
1513
#include <XEngine_Include/XEngine_Types.h>
1614
#include <XEngine_Include/XEngine_ProtocolHdr.h>
@@ -20,7 +18,8 @@
2018
#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
2119
#include "../../XEngine_Source/XQueue_ProtocolHdr.h"
2220

23-
//g++ -std=c++17 -Wall -g MQCore_HTTPApp.cpp -o MQCore_HTTPApp.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lXClient_APIHelp -ljsoncpp
21+
//VS2022 Debug x86 Compile
22+
//g++ -std=c++17 -Wall -g MQCore_HTTPApp.cpp -o MQCore_HTTPApp.exe -lXEngine_BaseLib -lXClient_APIHelp
2423

2524
void MQ_GetUserList()
2625
{

‎XEngine_Apps/MQCore_HTTPApp/MQCore_HTTPApp.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<PropertyGroup Label="UserMacros" />
7373
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7474
<LinkIncremental>true</LinkIncremental>
75-
<IncludePath>$(XEngine_Include);../../XEngine_Source/XEngine_ThirdPart/jsoncpp;$(IncludePath)</IncludePath>
75+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
7676
<LibraryPath>$(XEngine_Library);$(LibraryPath)</LibraryPath>
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

0 commit comments

Comments
 (0)