Skip to content

Commit c879c85

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #42 from libxengine/develop
Merge V3.13
2 parents e769e15 + 278c458 commit c879c85

Some content is hidden

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

46 files changed

+1474
-64
lines changed

‎.github/workflows/issue-translator.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Issue Translator
2+
on:
3+
issue_comment:
4+
types: [created]
5+
issues:
6+
types: [opened]
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: usthe/[email protected]
13+
with:
14+
IS_MODIFY_TITLE: false
15+
CUSTOM_BOT_NOTE: Bot detected the issue body's language is not English, translate it automatically.

‎.github/workflows/linuxbuild.yml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ name: ubuntu build workflows
33
on:
44
push:
55
branches: [ "develop" ]
6-
pull_request:
7-
branches: [ "develop" ]
6+
paths:
7+
- 'XEngine_Source/**'
8+
- 'XEngine_Release/**'
89

910
permissions:
1011
contents: read
@@ -17,7 +18,7 @@ jobs:
1718
matrix:
1819
include:
1920
- os: ubuntu-22.04
20-
- os: ubuntu-24.04
21+
#- os: ubuntu-24.04
2122
runs-on: ${{ matrix.os }}
2223

2324
steps:
@@ -61,4 +62,10 @@ jobs:
6162
- name: test
6263
run: |
6364
cd XEngine_Release
64-
./XEngine_MQServiceApp -t
65+
./XEngine_MQServiceApp -t
66+
67+
- name: Upload folder as artifact with ubuntu
68+
uses: actions/upload-artifact@v4
69+
with:
70+
name: XEngine_MQServiceApp-x86_64-Ubuntu
71+
path: XEngine_Release/

‎.github/workflows/macbuild.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ name: macos build workflows
33
on:
44
push:
55
branches: [ "develop" ]
6-
pull_request:
7-
branches: [ "develop" ]
6+
paths:
7+
- 'XEngine_Source/**'
8+
- 'XEngine_Release/**'
89

910
permissions:
1011
contents: read
@@ -62,3 +63,9 @@ jobs:
6263
run: |
6364
cd XEngine_Release
6465
./XEngine_MQServiceApp -t
66+
67+
- name: Upload folder as artifact with mac
68+
uses: actions/upload-artifact@v4
69+
with:
70+
name: XEngine_MQServiceApp-x86_64-Mac
71+
path: XEngine_Release/

‎.github/workflows/msbuild.yml‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ name: windows build workflows
33
on:
44
push:
55
branches: [ "develop" ]
6-
pull_request:
7-
branches: [ "develop" ]
6+
paths:
7+
- 'XEngine_Source/**'
8+
- 'XEngine_Release/**'
89

910
permissions:
1011
contents: read
@@ -60,18 +61,31 @@ jobs:
6061
run: |
6162
cp -r XEngine_Source/Release/*.dll XEngine_Release/
6263
cp -r XEngine_Source/Release/*.exe XEngine_Release/
63-
cp -r XEngine_Source/VSCopy-x86.bat XEngine_Release/
64+
cp -r XEngine_Source/VSCopy_x86.bat XEngine_Release/
6465
cd XEngine_Release
65-
./VSCopy-x86.bat
66+
./VSCopy_x86.bat
6667
./XEngine_MQServiceApp.exe -t
6768
shell: pwsh
6869
- name: Conditional Step for x86 Debug
69-
if: matrix.configuration == 'Debug' && matrix.platform == 'x86'
70+
if: matrix.configuration == 'Release' && matrix.platform == 'x64'
7071
run: |
71-
cp -r XEngine_Source/Debug/*.dll XEngine_Release/
72-
cp -r XEngine_Source/Debug/*.exe XEngine_Release/
73-
cp -r XEngine_Source/VSCopy-x86.bat XEngine_Release/
72+
cp -r XEngine_Source/x64/Release/*.dll XEngine_Release/
73+
cp -r XEngine_Source/x64/Release/*.exe XEngine_Release/
74+
cp -r XEngine_Source/VSCopy_x64.bat XEngine_Release/
7475
cd XEngine_Release
75-
./VSCopy-x86.bat
76-
./XEngine_MQServiceApp.exe -t
76+
./VSCopy_x64.bat
7777
shell: pwsh
78+
79+
- name: Upload folder as artifact with x86
80+
if: matrix.configuration == 'Release' && matrix.platform == 'x86'
81+
uses: actions/upload-artifact@v4
82+
with:
83+
name: XEngine_MQServiceApp-x86_32-Windows
84+
path: XEngine_Release/
85+
86+
- name: Upload folder as artifact with x64
87+
if: matrix.configuration == 'Release' && matrix.platform == 'x64'
88+
uses: actions/upload-artifact@v4
89+
with:
90+
name: XEngine_MQServiceApp-x86_64-Windows
91+
path: XEngine_Release/

‎.github/workflows/release.yml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
name: release packet
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
# 检出代码并包含标签
14+
- name: Checkout code
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
18+
19+
- name: Download linuxbuild
20+
uses: dawidd6/action-download-artifact@v6
21+
with:
22+
workflow: linuxbuild.yml
23+
workflow_conclusion: success
24+
check_artifacts: false
25+
skip_unpack: true
26+
if_no_artifact_found: fail
27+
path: ./XRelease/
28+
- name: Download macbuild
29+
uses: dawidd6/action-download-artifact@v6
30+
with:
31+
workflow: macbuild.yml
32+
workflow_conclusion: success
33+
check_artifacts: false
34+
skip_unpack: true
35+
if_no_artifact_found: fail
36+
path: ./XRelease/
37+
- name: Download msbuild
38+
uses: dawidd6/action-download-artifact@v6
39+
with:
40+
workflow: msbuild.yml
41+
workflow_conclusion: success
42+
check_artifacts: false
43+
skip_unpack: true
44+
if_no_artifact_found: fail
45+
path: ./XRelease/
46+
47+
- name: Display structure of downloaded files
48+
run: ls -al ./XRelease/
49+
50+
- name: Get current version and increment X
51+
id: versioning
52+
run: |
53+
latest_tag=$(git describe --tags `git rev-list --tags --max-count=1`)
54+
echo "Latest tag: $latest_tag"
55+
# 提取 X 的值并递增
56+
major=$(echo $latest_tag | cut -d '.' -f 1)
57+
minor=$(echo $latest_tag | cut -d '.' -f 2)
58+
patch=$(echo $latest_tag | cut -d '.' -f 3)
59+
build=$(echo $latest_tag | cut -d '.' -f 4)
60+
61+
new_minor=$((minor + 1))
62+
new_version="$major.$new_minor.$patch.$build"
63+
echo "New version: $new_version"
64+
echo "new_tag=$new_version" >> $GITHUB_OUTPUT
65+
echo "prev_tag=$latest_tag" >> $GITHUB_OUTPUT
66+
67+
- name: Create and push new tag
68+
run: |
69+
git tag ${{ steps.versioning.outputs.new_tag }}
70+
git push origin ${{ steps.versioning.outputs.new_tag }}
71+
72+
- name: Generate release notes
73+
run: |
74+
logs=$(git log ${{ steps.versioning.outputs.prev_tag }}..${{ steps.versioning.outputs.new_tag }} --pretty=format:"* %h - %s - %an" --no-merges)
75+
release_notes=$(echo "$logs" | sed 's/ qyt$/ @xengine-qyt/')
76+
echo "$release_notes"
77+
echo "$release_notes" > release_notes.txt
78+
79+
- name: Release
80+
uses: softprops/action-gh-release@v2
81+
env:
82+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
83+
with:
84+
draft: false
85+
prerelease: false
86+
tag_name: ${{ steps.versioning.outputs.new_tag }}
87+
name: XEngine_MQService ${{ steps.versioning.outputs.new_tag }}
88+
body_path: release_notes.txt
89+
files: ./XRelease/*.zip

‎CHANGELOG‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
XEngine_MQService V3.13.0.1001
2+
3+
增加:为DATA消息数据库增加高速缓存支持
4+
增加:coredump的windows支持
5+
更新:工作流自动发布支持
6+
更新:依赖库
7+
优化:启动参数解析
8+
修正:某些时候退出崩溃问题
9+
修正:发布消息时候获取在线用户不正确的问题
10+
修正:通知用户处理问题
11+
12+
added:memory cache module for Data DB
13+
added:coredump file support on windows
14+
update:release workflows supported
15+
update:depend library
16+
improved:start parameter parse
17+
fixed:sometime crashed when exist
18+
fixed:get online user is incorrect when publish message
19+
fixed:immediate notify user process is incorrect
20+
======================================================================================
121
XEngine_MQService V3.12.0.1001
222

323
增加:编译CI工作流支持

‎README.en.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ this software support following features
3333
17. binary message
3434
18. http interface management
3535
19. message attritube
36+
20. point to point message
37+
21. Memory Database
3638

3739
## install
3840

@@ -113,6 +115,7 @@ Address:app.xyry.org Port:TCP 5200,WEBSOCKET 5201,HTTP Management Interface 5202
113115
2. Create new Feat_xxx branch
114116
3. Submit the code
115117
4. New Pull Request
118+
5. Submit develop branch
116119

117120
## Follow us
118121
If you think this software is helpful to you, please give us a START

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ c c++Message Service
3232
17. 二进制消息
3333
18. http接口管理
3434
19. 消息属性
35+
20. 点对点消息
36+
21. 高速缓存
3537

3638
## 安装教程
3739

@@ -119,6 +121,7 @@ make FLAGS=CleanAll 清理编译
119121
2. 新建 Feat_xxx 分支
120122
3. 提交代码
121123
4. 新建 Pull Request
124+
5. 提交到develop分支
122125

123126
## 关注我们
124127
如果你觉得这个软件对你有帮助,请你给我们一个START吧

‎XEngine_Release/XEngine_Config/XEngine_Config.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"SQLAddr":"10.0.3.154",
2626
"SQLPort":3306,
2727
"SQLUser":"root",
28-
"SQLPass":"123123"
28+
"SQLPass":"123123aa"
2929
},
3030
"XPass":{
3131
"nTimeout":2,
@@ -34,6 +34,12 @@
3434
"tszPassLogin":"",
3535
"tszPassLogout":""
3636
},
37+
"XMemory":{
38+
"bDataQueryEnable":true,
39+
"bDataInsertEnable":true,
40+
"nTimeLast":3600,
41+
"nTimeStart":0
42+
},
3743
"XReport":{
3844
"bEnable":true,
3945
"tszServiceName":"XEngine_MQService",

‎XEngine_Release/XEngine_Config/XEngine_VerConfig.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"XVer":[
3+
"3.13.0.1001 Build20241129",
34
"3.12.0.1001 Build20240919",
45
"3.11.0.1001 Build20240517",
56
"3.10.0.1001 Build20240305",

0 commit comments

Comments
 (0)