Skip to content

Commit a45bde1

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #48 from libxengine/develop
V3.18 Merge
2 parents b5d8671 + 3c166c4 commit a45bde1

File tree

24 files changed

+310
-85
lines changed

24 files changed

+310
-85
lines changed

‎.github/workflows/Alma_build.yml‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
name: alma build workflows
2+
3+
on:
4+
push:
5+
branches:
6+
- 'develop'
7+
paths:
8+
- 'XEngine_Source/**'
9+
- 'XEngine_Release/**'
10+
- '.github/**'
11+
12+
permissions:
13+
contents: read
14+
15+
jobs:
16+
build:
17+
runs-on: ${{ matrix.runner }}
18+
container:
19+
image: almalinux:${{ matrix.version }}
20+
options: --platform ${{ matrix.platform }}
21+
strategy:
22+
matrix:
23+
include:
24+
- arch: amd64
25+
runner: ubuntu-24.04
26+
platform: linux/amd64
27+
artifact: x86-64
28+
version: 9
29+
- arch: amd64
30+
runner: ubuntu-24.04
31+
platform: linux/amd64
32+
artifact: x86-64
33+
version: 10
34+
- arch: arm64
35+
runner: ubuntu-24.04-arm
36+
platform: linux/arm64
37+
artifact: Arm64
38+
version: 9
39+
- arch: arm64
40+
runner: ubuntu-24.04-arm
41+
platform: linux/arm64
42+
artifact: Arm64
43+
version: 10
44+
45+
steps:
46+
- name: Checkout main repository code
47+
uses: actions/checkout@v4
48+
49+
- name: Checkout dependency repository (xengine)
50+
uses: actions/checkout@v4
51+
with:
52+
repository: libxengine/libxengine
53+
path: libxengine
54+
55+
- name: sub module checkout (opensource)
56+
uses: actions/checkout@v4
57+
with:
58+
repository: libxengine/XEngine_OPenSource
59+
path: XEngine_Source/XEngine_DependLibrary
60+
61+
- name: Set TERM variable
62+
run: echo "TERM=xterm" >> $GITHUB_ENV
63+
64+
- name: install system package
65+
run: |
66+
dnf update -y
67+
dnf install gcc g++ make git jq unzip wget -y
68+
69+
- name: install xengine library
70+
run: |
71+
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
72+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip
73+
unzip ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
74+
cd XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
75+
76+
chmod 777 *
77+
./XEngine_LINEnv.sh -i 3
78+
79+
- name: make
80+
run: |
81+
cd XEngine_Source
82+
make RELEASE=1
83+
make FLAGS=InstallAll
84+
make FLAGS=CleanAll
85+
cd ..
86+
- name: test
87+
run: |
88+
cd XEngine_Release
89+
./XEngine_MQServiceApp -t
90+
91+
- name: Upload folder as artifact
92+
uses: actions/upload-artifact@v4
93+
with:
94+
name: XEngine_MQServiceApp-AlmaLinux_${{ matrix.version }}_${{ matrix.artifact }}
95+
path: XEngine_Release/

‎.github/workflows/Centos_build.yml‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
name: centos build workflows
2+
3+
on:
4+
push:
5+
branches:
6+
- 'develop'
7+
paths:
8+
- 'XEngine_Source/**'
9+
- 'XEngine_Release/**'
10+
- '.github/**'
11+
12+
permissions:
13+
contents: read
14+
15+
jobs:
16+
build:
17+
runs-on: ${{ matrix.runner }}
18+
container:
19+
image: quay.io/centos/centos:${{ matrix.stream }}
20+
options: --platform ${{ matrix.platform }}
21+
strategy:
22+
matrix:
23+
include:
24+
- arch: amd64
25+
runner: ubuntu-24.04
26+
platform: linux/amd64
27+
artifact: x86-64
28+
version: 9
29+
stream: stream9
30+
- arch: amd64
31+
runner: ubuntu-24.04
32+
platform: linux/amd64
33+
artifact: x86-64
34+
version: 10
35+
stream: stream10
36+
- arch: arm64
37+
runner: ubuntu-24.04-arm
38+
platform: linux/arm64
39+
artifact: Arm64
40+
version: 9
41+
stream: stream9
42+
- arch: arm64
43+
runner: ubuntu-24.04-arm
44+
platform: linux/arm64
45+
artifact: Arm64
46+
version: 10
47+
stream: stream10
48+
49+
steps:
50+
- name: Checkout main repository code
51+
uses: actions/checkout@v4
52+
53+
- name: Checkout dependency repository (xengine)
54+
uses: actions/checkout@v4
55+
with:
56+
repository: libxengine/libxengine
57+
path: libxengine
58+
59+
- name: sub module checkout (opensource)
60+
uses: actions/checkout@v4
61+
with:
62+
repository: libxengine/XEngine_OPenSource
63+
path: XEngine_Source/XEngine_DependLibrary
64+
65+
- name: install system package
66+
run: |
67+
dnf update -y
68+
dnf install gcc g++ make git jq unzip wget -y
69+
70+
- name: Set TERM variable
71+
run: echo "TERM=xterm" >> $GITHUB_ENV
72+
73+
- name: install xengine library
74+
run: |
75+
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
76+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip
77+
unzip ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
78+
cd XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
79+
80+
chmod 777 *
81+
./XEngine_LINEnv.sh -i 3
82+
- name: make
83+
run: |
84+
cd XEngine_Source
85+
make
86+
make FLAGS=InstallAll
87+
make FLAGS=CleanAll
88+
89+
make RELEASE=1
90+
make FLAGS=InstallAll
91+
make FLAGS=CleanAll
92+
- name: test
93+
run: |
94+
cd XEngine_Release
95+
./XEngine_MQServiceApp -t
96+
97+
- name: Upload folder as artifact with CentOS
98+
uses: actions/upload-artifact@v4
99+
with:
100+
name: XEngine_MQServiceApp-CentOS_${{ matrix.version }}_${{ matrix.artifact }}
101+
path: XEngine_Release/
102+
retention-days: 1

‎.github/workflows/Rocky_build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ jobs:
9494
cd XEngine_Release
9595
./XEngine_MQServiceApp -t
9696
97-
- name: Upload folder as artifact with RockyLinux
97+
- name: Upload folder as artifact with CentOS
9898
uses: actions/upload-artifact@v4
9999
with:
100-
name: XEngine_MQServiceApp-RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
100+
name: XEngine_MQServiceApp-CentOS_${{ matrix.version }}_${{ matrix.artifact }}
101101
path: XEngine_Release/
102102
retention-days: 1

‎.github/workflows/debian_build.yml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
build:
1717
runs-on: ${{ matrix.runner }}
1818
container:
19-
image: debian:bookworm
19+
image: debian:${{ matrix.name }}
2020
options: --platform ${{ matrix.platform }}
2121
strategy:
2222
matrix:
@@ -25,6 +25,14 @@ jobs:
2525
runner: ubuntu-24.04
2626
platform: linux/amd64
2727
artifact: x86-64
28+
name: bookworm
29+
version: 12
30+
- arch: amd64
31+
runner: ubuntu-24.04
32+
platform: linux/amd64
33+
artifact: x86-64
34+
name: trixie
35+
version: 13
2836

2937
steps:
3038
- name: Checkout main repository code
@@ -53,20 +61,16 @@ jobs:
5361
- name: install xengine library
5462
run: |
5563
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
56-
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Debian_12_${{ matrix.artifact }}.zip
57-
unzip ./XEngine_Debian_12_${{ matrix.artifact }}.zip -d ./XEngine_Debian_12_${{ matrix.artifact }}
58-
cd XEngine_Debian_12_${{ matrix.artifact }}
64+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}.zip
65+
unzip ./XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}
66+
cd XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}
5967
6068
chmod 777 *
6169
./XEngine_LINEnv.sh -i 3
6270
6371
- name: make
6472
run: |
6573
cd XEngine_Source
66-
make
67-
make FLAGS=InstallAll
68-
make FLAGS=CleanAll
69-
7074
make RELEASE=1
7175
make FLAGS=InstallAll
7276
make FLAGS=CleanAll
@@ -79,6 +83,6 @@ jobs:
7983
- name: Upload folder as artifact
8084
uses: actions/upload-artifact@v4
8185
with:
82-
name: XEngine_MQServiceApp-Debian_12_x86-64
86+
name: XEngine_MQServiceApp-Debian_${{ matrix.version }}_x86-64
8387
path: XEngine_Release/
8488
retention-days: 1

‎.github/workflows/macbuild.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
strategy:
1515
matrix:
1616
include:
17-
- os: macos-13
18-
- os: macos-14
17+
- os: macos-15-intel
18+
- os: macos-15
1919
runs-on: ${{ matrix.os }}
2020

2121
steps:
@@ -42,13 +42,13 @@ jobs:
4242
run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
4343

4444
- name: Set up Dependency x86_64 Environment
45-
if: matrix.os == 'macos-13'
45+
if: matrix.os == 'macos-15-intel'
4646
run: |
4747
cd libxengine
4848
chmod 777 *
4949
./XEngine_LINEnv.sh -i 3
5050
- name: Set up Dependency Arm64 Environment
51-
if: matrix.os == 'macos-14'
51+
if: matrix.os == 'macos-15'
5252
run: |
5353
latest_tag=$(git ls-remote --tags --sort="v:refname" https://github.com/libxengine/libxengine.git | awk '{print $2}' | sed 's/refs\/tags\///' | tail -n 1)
5454
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Mac_Arm64.zip
@@ -76,14 +76,14 @@ jobs:
7676
./XEngine_MQServiceApp -t
7777
7878
- name: Upload folder as artifact with mac x64
79-
if: matrix.os == 'macos-13'
79+
if: matrix.os == 'macos-15-intel'
8080
uses: actions/upload-artifact@v4
8181
with:
8282
name: XEngine_MQServiceApp-Mac_x86_64
8383
path: XEngine_Release/
8484
retention-days: 1
8585
- name: Upload folder as artifact with mac arm
86-
if: matrix.os == 'macos-14'
86+
if: matrix.os == 'macos-15'
8787
uses: actions/upload-artifact@v4
8888
with:
8989
name: XEngine_MQServiceApp-Mac_Arm64

‎.github/workflows/release.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,24 @@ jobs:
5252
skip_unpack: true
5353
if_no_artifact_found: fail
5454
path: ./XRelease/
55+
- name: Download CentOS
56+
uses: dawidd6/action-download-artifact@v6
57+
with:
58+
workflow: Centos_build.yml
59+
workflow_conclusion: success
60+
check_artifacts: false
61+
skip_unpack: true
62+
if_no_artifact_found: fail
63+
path: ./XRelease/
64+
- name: Download Alma
65+
uses: dawidd6/action-download-artifact@v6
66+
with:
67+
workflow: Alma_build.yml
68+
workflow_conclusion: success
69+
check_artifacts: false
70+
skip_unpack: true
71+
if_no_artifact_found: fail
72+
path: ./XRelease/
5573
- name: Download macbuild
5674
uses: dawidd6/action-download-artifact@v6
5775
with:

‎CHANGELOG‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
XEngine_MQService V3.18.0.1001
2+
3+
ci:增加CentOS和Alma以及debian13系统支持
4+
ci:更新mac系统版本
5+
修改:启动参数不区分大小写了
6+
修改:用户数据缓冲区大小问题
7+
更新:匹配最新协议模块
8+
更新:依赖库
9+
修正:某些时候读取配置文件内存问题
10+
11+
ci:add centos alma linux and debian 13 system support
12+
ci:update mac system version
13+
modify:does not case sensitive for start parameter
14+
modify:user data memory size
15+
update:match last version source module protocol
16+
update:depend library
17+
fixed:read configure memory leak
18+
======================================================================================
119
XEngine_MQService V3.17.0.1001
220

321
增加:rocky linux 10 支持

‎XEngine_Apps/MQCore_TCPApp/MQCore_TCPApp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void MQ_Authorize()
4141

4242
st_ProtocolHdr.wHeader = XENGIEN_COMMUNICATION_PACKET_PROTOCOL_HEADER;
4343
st_ProtocolHdr.unOperatorType = ENUM_XENGINE_COMMUNICATION_PROTOCOL_TYPE_AUTH;
44-
st_ProtocolHdr.unOperatorCode = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_MQ_REQUSERLOG;
44+
st_ProtocolHdr.unOperatorCode = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_AUTH_REQLOGIN;
4545
st_ProtocolHdr.byVersion = 1;
4646
st_ProtocolHdr.byIsReply = true; //获得处理返回结果
4747
st_ProtocolHdr.wTail = XENGIEN_COMMUNICATION_PACKET_PROTOCOL_TAIL;

‎XEngine_Apps/MQCore_WSApp/MQCore_WSApp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void MQ_Authorize()
7676
Json::Value st_JsonRoot;
7777
Json::Value st_JsonAuth;
7878
st_JsonRoot["unOperatorType"] = ENUM_XENGINE_COMMUNICATION_PROTOCOL_TYPE_AUTH;
79-
st_JsonRoot["unOperatorCode"] = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_MQ_REQUSERLOG;
79+
st_JsonRoot["unOperatorCode"] = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_AUTH_REQLOGIN;
8080
st_JsonRoot["byVersion"] = ENUM_XENGINE_PROTOCOLHDR_PAYLOAD_TYPE_JSON;
8181

8282
st_JsonAuth["tszUserName"] = "123123aa";

0 commit comments

Comments
 (0)