Skip to content

Commit d8715f8

Browse files
authored
Merge pull request #15 from libxengine/develop
V3.7.0.1001 Merge
2 parents 32f028c + 228212e commit d8715f8

File tree

70 files changed

+1963
-1691
lines changed

Some content is hidden

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

70 files changed

+1963
-1691
lines changed

CHANGELOG

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
XEngine_MQService V3.7.0.1001
2+
3+
添加:定时发布是否跳过本身功能
4+
添加:数据库配置配置文件
5+
优化:编译脚本
6+
更新:匹配支持XEngine V8.x版本
7+
更新:打印的版本信息
8+
更新:mysql数据库字符集现在使用utf8mb4 和 unicode
9+
修改:mysql字符集现在使用UTF8连接
10+
修改:在登录后,可以通过HTTP GET方法获取数据了
11+
修改:现在可以设置清理和不清理定时发布的任务了
12+
修改:数据库的data数据类型修改为二进制类型,现在支持保存二进制了
13+
删除:数据库的msglen字段,不需要
14+
15+
added:whether break self for time release
16+
added:db configure for configure module
17+
improved:makefile
18+
update:match xengine v8.x
19+
update:version printf log
20+
update:mysql charset to utf8mb4 and unicode
21+
modify:mysql charset to utf8 now
22+
modify:after login in,get message through get method of http
23+
modify:can be clear or not clear for time release
24+
modify:data to blob type for database,support binary data now
25+
delete:nMsgLen field of database
26+
======================================================================================
127
XEngine_MQService V3.6.0.1001
228

329
增加:主题所有者数据支持

LICENSE

Lines changed: 21 additions & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -1,165 +1,21 @@
1-
GNU LESSER GENERAL PUBLIC LICENSE
2-
Version 3, 29 June 2007
3-
4-
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
5-
Everyone is permitted to copy and distribute verbatim copies
6-
of this license document, but changing it is not allowed.
7-
8-
9-
This version of the GNU Lesser General Public License incorporates
10-
the terms and conditions of version 3 of the GNU General Public
11-
License, supplemented by the additional permissions listed below.
12-
13-
0. Additional Definitions.
14-
15-
As used herein, "this License" refers to version 3 of the GNU Lesser
16-
General Public License, and the "GNU GPL" refers to version 3 of the GNU
17-
General Public License.
18-
19-
"The Library" refers to a covered work governed by this License,
20-
other than an Application or a Combined Work as defined below.
21-
22-
An "Application" is any work that makes use of an interface provided
23-
by the Library, but which is not otherwise based on the Library.
24-
Defining a subclass of a class defined by the Library is deemed a mode
25-
of using an interface provided by the Library.
26-
27-
A "Combined Work" is a work produced by combining or linking an
28-
Application with the Library. The particular version of the Library
29-
with which the Combined Work was made is also called the "Linked
30-
Version".
31-
32-
The "Minimal Corresponding Source" for a Combined Work means the
33-
Corresponding Source for the Combined Work, excluding any source code
34-
for portions of the Combined Work that, considered in isolation, are
35-
based on the Application, and not on the Linked Version.
36-
37-
The "Corresponding Application Code" for a Combined Work means the
38-
object code and/or source code for the Application, including any data
39-
and utility programs needed for reproducing the Combined Work from the
40-
Application, but excluding the System Libraries of the Combined Work.
41-
42-
1. Exception to Section 3 of the GNU GPL.
43-
44-
You may convey a covered work under sections 3 and 4 of this License
45-
without being bound by section 3 of the GNU GPL.
46-
47-
2. Conveying Modified Versions.
48-
49-
If you modify a copy of the Library, and, in your modifications, a
50-
facility refers to a function or data to be supplied by an Application
51-
that uses the facility (other than as an argument passed when the
52-
facility is invoked), then you may convey a copy of the modified
53-
version:
54-
55-
a) under this License, provided that you make a good faith effort to
56-
ensure that, in the event an Application does not supply the
57-
function or data, the facility still operates, and performs
58-
whatever part of its purpose remains meaningful, or
59-
60-
b) under the GNU GPL, with none of the additional permissions of
61-
this License applicable to that copy.
62-
63-
3. Object Code Incorporating Material from Library Header Files.
64-
65-
The object code form of an Application may incorporate material from
66-
a header file that is part of the Library. You may convey such object
67-
code under terms of your choice, provided that, if the incorporated
68-
material is not limited to numerical parameters, data structure
69-
layouts and accessors, or small macros, inline functions and templates
70-
(ten or fewer lines in length), you do both of the following:
71-
72-
a) Give prominent notice with each copy of the object code that the
73-
Library is used in it and that the Library and its use are
74-
covered by this License.
75-
76-
b) Accompany the object code with a copy of the GNU GPL and this license
77-
document.
78-
79-
4. Combined Works.
80-
81-
You may convey a Combined Work under terms of your choice that,
82-
taken together, effectively do not restrict modification of the
83-
portions of the Library contained in the Combined Work and reverse
84-
engineering for debugging such modifications, if you also do each of
85-
the following:
86-
87-
a) Give prominent notice with each copy of the Combined Work that
88-
the Library is used in it and that the Library and its use are
89-
covered by this License.
90-
91-
b) Accompany the Combined Work with a copy of the GNU GPL and this license
92-
document.
93-
94-
c) For a Combined Work that displays copyright notices during
95-
execution, include the copyright notice for the Library among
96-
these notices, as well as a reference directing the user to the
97-
copies of the GNU GPL and this license document.
98-
99-
d) Do one of the following:
100-
101-
0) Convey the Minimal Corresponding Source under the terms of this
102-
License, and the Corresponding Application Code in a form
103-
suitable for, and under terms that permit, the user to
104-
recombine or relink the Application with a modified version of
105-
the Linked Version to produce a modified Combined Work, in the
106-
manner specified by section 6 of the GNU GPL for conveying
107-
Corresponding Source.
108-
109-
1) Use a suitable shared library mechanism for linking with the
110-
Library. A suitable mechanism is one that (a) uses at run time
111-
a copy of the Library already present on the user's computer
112-
system, and (b) will operate properly with a modified version
113-
of the Library that is interface-compatible with the Linked
114-
Version.
115-
116-
e) Provide Installation Information, but only if you would otherwise
117-
be required to provide such information under section 6 of the
118-
GNU GPL, and only to the extent that such information is
119-
necessary to install and execute a modified version of the
120-
Combined Work produced by recombining or relinking the
121-
Application with a modified version of the Linked Version. (If
122-
you use option 4d0, the Installation Information must accompany
123-
the Minimal Corresponding Source and Corresponding Application
124-
Code. If you use option 4d1, you must provide the Installation
125-
Information in the manner specified by section 6 of the GNU GPL
126-
for conveying Corresponding Source.)
127-
128-
5. Combined Libraries.
129-
130-
You may place library facilities that are a work based on the
131-
Library side by side in a single library together with other library
132-
facilities that are not Applications and are not covered by this
133-
License, and convey such a combined library under terms of your
134-
choice, if you do both of the following:
135-
136-
a) Accompany the combined library with a copy of the same work based
137-
on the Library, uncombined with any other library facilities,
138-
conveyed under the terms of this License.
139-
140-
b) Give prominent notice with the combined library that part of it
141-
is a work based on the Library, and explaining where to find the
142-
accompanying uncombined form of the same work.
143-
144-
6. Revised Versions of the GNU Lesser General Public License.
145-
146-
The Free Software Foundation may publish revised and/or new versions
147-
of the GNU Lesser General Public License from time to time. Such new
148-
versions will be similar in spirit to the present version, but may
149-
differ in detail to address new problems or concerns.
150-
151-
Each version is given a distinguishing version number. If the
152-
Library as you received it specifies that a certain numbered version
153-
of the GNU Lesser General Public License "or any later version"
154-
applies to it, you have the option of following the terms and
155-
conditions either of that published version or of any later version
156-
published by the Free Software Foundation. If the Library as you
157-
received it does not specify a version number of the GNU Lesser
158-
General Public License, you may choose any version of the GNU Lesser
159-
General Public License ever published by the Free Software Foundation.
160-
161-
If the Library as you received it specifies that a proxy can decide
162-
whether future versions of the GNU Lesser General Public License shall
163-
apply, that proxy's public statement of acceptance of any version is
164-
permanent authorization for you to choose that version for the
165-
Library.
1+
MIT License
2+
3+
Copyright (c) 2023 XEngine:www.xyry.org
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.en.md

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,12 @@ this software support following features
3030
14. Unlimited load message types
3131
15. timed message
3232
16. Access control(planning)
33+
17. binary message(only tcp)
3334

3435
## install
3536

3637
#### XEngine Evn
37-
you must install XEngine,need V7.46 or above,install XEngine can be refer to xengine Readme docment
38+
you must install XEngine,need V8.10 or above,install XEngine can be refer to xengine Readme docment
3839
GITEE:https://gitee.com/xyry/libxengine
3940
GITHUB:https://github.com/libxengine/xengine
4041

@@ -44,26 +45,35 @@ window Exection XEngine_WINEnv.bat
4445
Linux Exection:sudo ./XEngine_LINEnv.sh -i 3
4546
Macos Exection:./XEngine_LINEnv.sh -i 3
4647

47-
##### dependent environment
48-
need to mysql service support,exection XEngine_SQLFile/CreateDatabase.sql to create database
49-
and exection:XEngine_SQLFile/XEngine_MQData.sql and XEngine_SQLFile/XEngine_MQUser.sql to create table
50-
5148
#### Windows
5249
use vs open and complie,support windows 7sp1 and above
5350
Just Run it.
5451

5552
#### Linux
5653
Linux use Makefile to complie
57-
supproted ubuntu x64 or centos x64
58-
59-
#### MacOS
60-
Linux use Makefile to complie,terminal exection,Requires mac 12 and above
54+
supproted ubuntu22.04 x64 or RockyLinux9 x64
6155

62-
##### complie
56+
###### complie
6357
execute command in XEngine_Source path
6458
make complie
6559
make FLAGS=InstallAll install
6660
make FLAGS=CleanAll clear
61+
If there is no error.you can see complied XEngine_MQServiceApp file in XEngine_Release
62+
You can running at terminal.
63+
64+
#### MacOS
65+
Linux use Makefile to complie,terminal exection,Requires mac 13 and above
66+
###### complie
67+
same linux
68+
69+
## Installation Instructions
70+
#### Install
71+
Modify the configuration file to what you need, and then run the service directly
72+
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.
73+
74+
#### upgrade
75+
If it is an upgrade installation, after downloading the new version and modifying the configuration file, it can be run directly
76+
database you need to open the database matching fields and tables are consistent
6777

6878
#### use
6979

README.md

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ c c++Message Service
2929
14. 不限制负载的消息类型
3030
15. 定时消息
3131
16. 权限控制(planning)
32+
17. 二进制消息(only tcp)
3233

3334
## 安装教程
3435

3536
#### XEngine环境
36-
必须安装XEngine,版本需要V7.46或者以上版本,安装XEngine可以参考其Readme文档
37+
必须安装XEngine,版本需要V8.10或者以上版本,安装XEngine可以参考其Readme文档
3738
GITEE:https://gitee.com/xyry/libxengine
3839
GITHUB:https://github.com/libxengine/xengine
3940

@@ -45,26 +46,40 @@ macos执行:./XEngine_LINEnv.sh -i 3
4546

4647
##### 依赖环境
4748
需要MYSQL服务的支持,执行XEngine_SQLFile/CreateDatabase.sql 创建数据库
48-
分别执行:执行XEngine_SQLFile/XEngine_MQData.sql 和 执行XEngine_SQLFile/XEngine_MQUser.sql 创建库
49+
分别执行:执行XEngine_SQLFile/XEngine_MQData.sql 和 执行XEngine_SQLFile/XEngine_MQUser.sql 创建表
4950

5051
#### Windows
5152
使用VS打开并且编译,支持WINDOWS 7SP1以上系统
5253
直接运行即可
5354

5455
#### Linux
5556
Linux使用Makefile编译
56-
UBUNTU20.04 x64或者CENTOS8 x64均可
57+
UBUNTU22.04 x64或者RockyLinux9 x64均可
5758
在控制台运行
5859

59-
#### MacOS
60-
使用makefile编译,控制台运行,需要mac 12以及以上版本
61-
在控制台运行
62-
63-
##### 编译命令
60+
###### 编译命令
6461
在XEngine_Source目录下执行命令
6562
make 编译
6663
make FLAGS=InstallAll 安装库程序
6764
make FLAGS=CleanAll 清理编译
65+
如果没有错误,你可以在XEngine_Release目录下看到编译的XEngine_MQServiceApp
66+
然后直接在终端运行它即可.
67+
68+
#### MacOS
69+
使用makefile编译,控制台运行,需要mac 13以及以上版本
70+
在控制台运行
71+
72+
###### 编译命令
73+
同LINUX
74+
75+
## 安装指导
76+
#### 安装
77+
修改配置文件为你需要的,然后直接运行服务即可
78+
需要MYSQL服务,使用CreateDatabase.sql创建数据库,然后导入执行XEngine_SQLFile/XEngine_MQData.sql 和 执行XEngine_SQLFile/XEngine_MQUser.sql 创建表
79+
80+
#### 升级
81+
如果是升级安装,下载新版本后修改配置文件就可以直接运行了
82+
数据库需要打开数据库匹配字段和表是否一致
6883

6984
#### 使用说明
7085

@@ -113,6 +128,8 @@ MQTT支持
113128
完善HTTP_CALL
114129
允许主题解除绑定
115130
允许删除主题
131+
高性能内存队列
132+
多次登录验证
116133

117134
## 提交问题
118135

0 commit comments

Comments
 (0)