Skip to content

Commit f20bf0f

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #108 from libxengine/develop
V3.20 Merge to release
2 parents 70f7852 + 3f92a7e commit f20bf0f

File tree

96 files changed

+653
-5767
lines changed

Some content is hidden

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

96 files changed

+653
-5767
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_AuthorizeService -t
90+
91+
- name: Upload folder as artifact
92+
uses: actions/upload-artifact@v4
93+
with:
94+
name: XEngine_AuthorizeService-AlmaLinux_${{ matrix.version }}_${{ matrix.artifact }}
95+
path: XEngine_Release/

‎.github/workflows/Centos_build.yml‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
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: Set TERM variable
66+
run: echo "TERM=xterm" >> $GITHUB_ENV
67+
68+
- name: install system package
69+
run: |
70+
dnf update -y
71+
dnf install gcc g++ make git jq unzip wget -y
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+
83+
- name: make
84+
run: |
85+
cd XEngine_Source
86+
make RELEASE=1
87+
make FLAGS=InstallAll
88+
make FLAGS=CleanAll
89+
cd ..
90+
- name: test
91+
run: |
92+
cd XEngine_Release
93+
./XEngine_AuthorizeService -t
94+
95+
- name: Upload folder as artifact
96+
uses: actions/upload-artifact@v4
97+
with:
98+
name: XEngine_AuthorizeService-CentOS_${{ matrix.version }}_${{ matrix.artifact }}
99+
path: XEngine_Release/

‎.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_AuthorizeService-Debian_12_x86-64
86+
name: XEngine_AuthorizeService-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:
@@ -43,13 +43,13 @@ jobs:
4343
run: echo "TERM=xterm" >> $GITHUB_ENV
4444

4545
- name: Set up Dependency x86_64 Environment
46-
if: matrix.os == 'macos-13'
46+
if: matrix.os == 'macos-15-intel'
4747
run: |
4848
cd libxengine
4949
chmod 777 *
5050
./XEngine_LINEnv.sh -i 3
5151
- name: Set up Dependency Arm64 Environment
52-
if: matrix.os == 'macos-14'
52+
if: matrix.os == 'macos-15'
5353
run: |
5454
cd libxengine
5555
chmod 777 *
@@ -84,14 +84,14 @@ jobs:
8484
./XEngine_AuthorizeService -t
8585
8686
- name: Upload folder as artifact with mac x64
87-
if: matrix.os == 'macos-13'
87+
if: matrix.os == 'macos-15-intel'
8888
uses: actions/upload-artifact@v4
8989
with:
9090
name: XEngine_AuthorizeService-Mac_x86-64
9191
path: XEngine_Release/
9292
retention-days: 1
9393
- name: Upload folder as artifact with mac arm
94-
if: matrix.os == 'macos-14'
94+
if: matrix.os == 'macos-15'
9595
uses: actions/upload-artifact@v4
9696
with:
9797
name: XEngine_AuthorizeService-Mac_Arm64

‎.github/workflows/release.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,24 @@ jobs:
7070
skip_unpack: true
7171
if_no_artifact_found: fail
7272
path: ./XRelease/
73+
- name: Download Alma Linux
74+
uses: dawidd6/action-download-artifact@v6
75+
with:
76+
workflow: Alma_build.yml
77+
workflow_conclusion: success
78+
check_artifacts: false
79+
skip_unpack: true
80+
if_no_artifact_found: fail
81+
path: ./XRelease/
82+
- name: Download CentOS
83+
uses: dawidd6/action-download-artifact@v6
84+
with:
85+
workflow: Centos_build.yml
86+
workflow_conclusion: success
87+
check_artifacts: false
88+
skip_unpack: true
89+
if_no_artifact_found: fail
90+
path: ./XRelease/
7391

7492
- name: Display structure of downloaded files
7593
run: ls -al ./XRelease/

‎CHANGELOG‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
XEngine_Authorize V3.20.0.1001
2+
3+
ci:centos and alma linux and debian 13 system support
4+
modify:cdkey module to verification module from depend library
5+
modify:delete push serial and use custom serial insert instead
6+
modify:re generator serial key when cdkey network create
7+
fixed:http verification status incorrect
8+
fixed:sometimes memory leak when read configure
9+
update:depend library
10+
delete:client module
11+
delete:cd key module
12+
delete:more protocol define
13+
delete:parse cdkey protocol and use verification read instead
14+
15+
工作流:支持centos和alma以及debian13系统支持
16+
修改:cdkey模块功能使用了依赖库的验证模块替换
17+
修改:序列号现在使用自定义序列号替换了
18+
修改:网络验证创建的CDKEY现在需要通过服务器重新生成的序列号
19+
修正:http验证状态错误
20+
修正:某些时候读取配置内存溢出
21+
更新:依赖库
22+
删除:客户端模块
23+
删除:cdkey模块
24+
删除:多余的协议定义
25+
删除:解析CDKEY协议并且使用验证模块读取替换
26+
================================================================
127
XEngine_Authorize V3.19.0.1001
228

329
added:more system support

‎XEngine_Apps/Authorize_APPClient.sln‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Authorize_APPClient", "Auth
77
EndProject
88
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Authorize_APPLocal", "Authorize_APPLocal\Authorize_APPLocal.vcxproj", "{767151F7-230E-431B-AC6D-683F19F43C13}"
99
EndProject
10-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Authorize_ClientModule", "Authorize_ClientModule\Authorize_ClientModule.vcxproj", "{82B923A9-2F4A-4784-A245-BAA6ABF5A358}"
11-
EndProject
1210
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Authorize_CDKeyNetVer", "Authorize_CDKeyNetVer\Authorize_CDKeyNetVer.vcxproj", "{1D584651-5E93-43BA-9A48-E7D199DC587F}"
1311
EndProject
12+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Authorize_ClientModule", "Authorize_ClientModule\Authorize_ClientModule.vcxproj", "{82B923A9-2F4A-4784-A245-BAA6ABF5A358}"
13+
EndProject
1414
Global
1515
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1616
Debug|x64 = Debug|x64
@@ -35,14 +35,6 @@ Global
3535
{767151F7-230E-431B-AC6D-683F19F43C13}.Release|x64.Build.0 = Release|x64
3636
{767151F7-230E-431B-AC6D-683F19F43C13}.Release|x86.ActiveCfg = Release|Win32
3737
{767151F7-230E-431B-AC6D-683F19F43C13}.Release|x86.Build.0 = Release|Win32
38-
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x64.ActiveCfg = Debug|x64
39-
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x64.Build.0 = Debug|x64
40-
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x86.ActiveCfg = Debug|Win32
41-
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x86.Build.0 = Debug|Win32
42-
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x64.ActiveCfg = Release|x64
43-
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x64.Build.0 = Release|x64
44-
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x86.ActiveCfg = Release|Win32
45-
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x86.Build.0 = Release|Win32
4638
{1D584651-5E93-43BA-9A48-E7D199DC587F}.Debug|x64.ActiveCfg = Debug|x64
4739
{1D584651-5E93-43BA-9A48-E7D199DC587F}.Debug|x64.Build.0 = Debug|x64
4840
{1D584651-5E93-43BA-9A48-E7D199DC587F}.Debug|x86.ActiveCfg = Debug|Win32
@@ -51,6 +43,14 @@ Global
5143
{1D584651-5E93-43BA-9A48-E7D199DC587F}.Release|x64.Build.0 = Release|x64
5244
{1D584651-5E93-43BA-9A48-E7D199DC587F}.Release|x86.ActiveCfg = Release|Win32
5345
{1D584651-5E93-43BA-9A48-E7D199DC587F}.Release|x86.Build.0 = Release|Win32
46+
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x64.ActiveCfg = Debug|x64
47+
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x64.Build.0 = Debug|x64
48+
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x86.ActiveCfg = Debug|Win32
49+
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x86.Build.0 = Debug|Win32
50+
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x64.ActiveCfg = Release|x64
51+
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x64.Build.0 = Release|x64
52+
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x86.ActiveCfg = Release|Win32
53+
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x86.Build.0 = Release|Win32
5454
EndGlobalSection
5555
GlobalSection(SolutionProperties) = preSolution
5656
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)