Skip to content

Commit 70f7852

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #104 from libxengine/develop
V3.19 Merge
2 parents 922b61b + 985fff1 commit 70f7852

File tree

106 files changed

+1092
-520
lines changed

Some content is hidden

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

106 files changed

+1092
-520
lines changed

‎.github/workflows/Rocky_build.yml‎

Lines changed: 25 additions & 15 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: rockylinux/rockylinux:9.5
19+
image: rockylinux/rockylinux:${{ matrix.version }}
2020
options: --platform ${{ matrix.platform }}
2121
strategy:
2222
matrix:
@@ -25,10 +25,22 @@ jobs:
2525
runner: ubuntu-24.04
2626
platform: linux/amd64
2727
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
2834
- arch: arm64
2935
runner: ubuntu-24.04-arm
3036
platform: linux/arm64
3137
artifact: Arm64
38+
version: 9
39+
- arch: arm64
40+
runner: ubuntu-24.04-arm
41+
platform: linux/arm64
42+
artifact: Arm64
43+
version: 10
3244

3345
steps:
3446
- name: Checkout main repository code
@@ -46,27 +58,25 @@ jobs:
4658
uses: actions/checkout@v4
4759
with:
4860
repository: libxengine/XEngine_OPenSource
49-
path: XEngine_Source/XEngine_Depend
61+
path: XEngine_Source/XEngine_DependLibrary
5062

5163
- name: install system package
5264
run: |
5365
dnf update -y
54-
dnf install gcc g++ make git jq unzip -y
55-
- name: Set up Dependency rocky linux Environment
56-
run: |
57-
cd libxengine
58-
chmod 777 *
59-
./XEngine_LINEnv.sh -i 0
66+
dnf install gcc g++ make git jq unzip wget -y
67+
68+
- name: Set TERM variable
69+
run: echo "TERM=xterm" >> $GITHUB_ENV
70+
6071
- name: install xengine library
6172
run: |
6273
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
63-
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_9_${{ matrix.artifact }}.zip
64-
unzip ./XEngine_RockyLinux_9_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_9_${{ matrix.artifact }}
65-
cd XEngine_RockyLinux_9_${{ matrix.artifact }}
74+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip
75+
unzip ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
76+
cd XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
6677
67-
cp -rf ./XEngine_Include /usr/local/include
68-
find ./XEngine_Linux -name "*.so" -exec cp {} /usr/lib64 \;
69-
ldconfig
78+
chmod 777 *
79+
./XEngine_LINEnv.sh -i 3
7080
7181
- name: make
7282
run: |
@@ -87,6 +97,6 @@ jobs:
8797
- name: Upload folder as artifact with RockyLinux
8898
uses: actions/upload-artifact@v4
8999
with:
90-
name: XEngine_AuthorizeService-RockyLinux_9_${{ matrix.artifact }}
100+
name: XEngine_AuthorizeService-RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
91101
path: XEngine_Release/
92102
retention-days: 1

‎.github/workflows/Ubuntu_build.yml‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ jobs:
3939
git submodule init
4040
git submodule update
4141
42+
- name: Set TERM variable
43+
run: echo "TERM=xterm" >> $GITHUB_ENV
44+
4245
- name: Set up Dependency ubuntu24.04 Environment
4346
if: matrix.os == 'ubuntu-24.04'
4447
run: |
@@ -48,48 +51,33 @@ jobs:
4851
- name: Set up Dependency ubuntu24.04 ARM64 Environment
4952
if: matrix.os == 'ubuntu-24.04-arm'
5053
run: |
51-
cd libxengine
52-
chmod 777 *
53-
sudo ./XEngine_LINEnv.sh -i 0
54-
5554
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
5655
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_UBuntu_24.04_Arm64.zip
5756
unzip ./XEngine_UBuntu_24.04_Arm64.zip -d ./XEngine_UBuntu_24.04_Arm64
5857
cd XEngine_UBuntu_24.04_Arm64
5958
60-
sudo cp -rf ./XEngine_Include /usr/local/include
61-
sudo find ./XEngine_Linux -name "*.so" -exec cp {} /usr/local/lib \;
62-
sudo ldconfig
59+
chmod 777 *
60+
sudo ./XEngine_LINEnv.sh -i 3
6361
- name: Set up Dependency ubuntu22.04 Environment
6462
if: matrix.os == 'ubuntu-22.04'
6563
run: |
66-
cd libxengine
67-
chmod 777 *
68-
sudo ./XEngine_LINEnv.sh -i 0
69-
7064
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
7165
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_UBuntu_22.04_x86-64.zip
7266
unzip ./XEngine_UBuntu_22.04_x86-64.zip -d ./XEngine_UBuntu_22.04_x86-64
7367
cd XEngine_UBuntu_22.04_x86-64
7468
75-
sudo cp -rf ./XEngine_Include /usr/local/include
76-
sudo find ./XEngine_Linux -name "*.so" -exec cp {} /usr/local/lib \;
77-
sudo ldconfig
69+
chmod 777 *
70+
sudo ./XEngine_LINEnv.sh -i 3
7871
- name: Set up Dependency ubuntu22.04 arm64 Environment
7972
if: matrix.os == 'ubuntu-22.04-arm'
8073
run: |
81-
cd libxengine
82-
chmod 777 *
83-
sudo ./XEngine_LINEnv.sh -i 0
84-
8574
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
8675
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_UBuntu_22.04_Arm64.zip
8776
unzip ./XEngine_UBuntu_22.04_Arm64.zip -d ./XEngine_UBuntu_22.04_Arm64
8877
cd XEngine_UBuntu_22.04_Arm64
8978
90-
sudo cp -rf ./XEngine_Include /usr/local/include
91-
sudo find ./XEngine_Linux -name "*.so" -exec cp {} /usr/local/lib \;
92-
sudo ldconfig
79+
chmod 777 *
80+
sudo ./XEngine_LINEnv.sh -i 3
9381
9482
- name: make x86
9583
if: matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-22.04'

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ jobs:
4040
git submodule init
4141
git submodule update
4242
43+
- name: Set TERM variable
44+
run: echo "TERM=xterm" >> $GITHUB_ENV
45+
4346
- name: Set up Dependency Environment
4447
run: |
4548
cd libxengine

‎.github/workflows/debian_build.yml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,28 +40,25 @@ jobs:
4040
uses: actions/checkout@v4
4141
with:
4242
repository: libxengine/XEngine_OPenSource
43-
path: XEngine_Source/XEngine_Depend
43+
path: XEngine_Source/XEngine_DependLibrary
4444

4545
- name: install system package
4646
run: |
4747
apt update -y
48-
apt install gcc g++ make git jq unzip curl -y
48+
apt install gcc g++ make git jq unzip curl wget -y
4949
50-
- name: Set up Dependency rocky linux Environment
51-
run: |
52-
cd libxengine
53-
chmod 777 *
54-
./XEngine_LINEnv.sh -i 0
50+
- name: Set TERM variable
51+
run: echo "TERM=xterm" >> $GITHUB_ENV
52+
5553
- name: install xengine library
5654
run: |
5755
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
5856
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Debian_12_${{ matrix.artifact }}.zip
5957
unzip ./XEngine_Debian_12_${{ matrix.artifact }}.zip -d ./XEngine_Debian_12_${{ matrix.artifact }}
6058
cd XEngine_Debian_12_${{ matrix.artifact }}
6159
62-
cp -rf ./XEngine_Include /usr/local/include
63-
find ./XEngine_Linux -name "*.so" -exec cp {} /usr/local/lib \;
64-
ldconfig
60+
chmod 777 *
61+
./XEngine_LINEnv.sh -i 3
6562
6663
- name: make
6764
run: |

‎.github/workflows/fedora_build.yml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
name: fedora 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: fedora:${{ matrix.fedora-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+
fedora-version: 42
28+
artifact: x86-64
29+
- arch: amd64
30+
runner: ubuntu-24.04
31+
platform: linux/amd64
32+
fedora-version: 41
33+
artifact: x86-64
34+
35+
steps:
36+
- name: Checkout main repository code
37+
uses: actions/checkout@v4
38+
39+
- name: Checkout dependency repository (xengine)
40+
uses: actions/checkout@v4
41+
with:
42+
repository: libxengine/libxengine
43+
path: libxengine
44+
45+
- name: sub module checkout (opensource)
46+
uses: actions/checkout@v4
47+
with:
48+
repository: libxengine/XEngine_OPenSource
49+
path: XEngine_Source/XEngine_DependLibrary
50+
51+
- name: install system package
52+
run: |
53+
dnf update -y
54+
dnf install gcc g++ make git jq unzip wget -y
55+
56+
- name: Set TERM variable
57+
run: echo "TERM=xterm" >> $GITHUB_ENV
58+
59+
- name: install xengine library
60+
run: |
61+
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
62+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}.zip
63+
unzip ./XEngine_Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}.zip -d ./XEngine_Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}
64+
cd XEngine_Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}
65+
66+
chmod 777 *
67+
./XEngine_LINEnv.sh -i 3
68+
- name: make
69+
run: |
70+
cd XEngine_Source
71+
make
72+
make FLAGS=InstallAll
73+
make FLAGS=CleanAll
74+
75+
make RELEASE=1
76+
make FLAGS=InstallAll
77+
make FLAGS=CleanAll
78+
cd ..
79+
- name: test
80+
run: |
81+
cd XEngine_Release
82+
./XEngine_AuthorizeService -t
83+
84+
- name: Upload folder as artifact
85+
uses: actions/upload-artifact@v4
86+
with:
87+
name: XEngine_AuthorizeService-Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}
88+
path: XEngine_Release/
89+
retention-days: 1

‎.github/workflows/macbuild.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ jobs:
3838
3939
- name: brew install
4040
run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
41-
41+
42+
- name: Set TERM variable
43+
run: echo "TERM=xterm" >> $GITHUB_ENV
44+
4245
- name: Set up Dependency x86_64 Environment
4346
if: matrix.os == 'macos-13'
4447
run: |

‎.github/workflows/release.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,15 @@ jobs:
3434
skip_unpack: true
3535
if_no_artifact_found: fail
3636
path: ./XRelease/
37+
- name: Download fedora build
38+
uses: dawidd6/action-download-artifact@v6
39+
with:
40+
workflow: fedora_build.yml
41+
workflow_conclusion: success
42+
check_artifacts: false
43+
skip_unpack: true
44+
if_no_artifact_found: fail
45+
path: ./XRelease/
3746
- name: Download RockyLinux build
3847
uses: dawidd6/action-download-artifact@v6
3948
with:

‎.gitmodules‎

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

‎CHANGELOG‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
XEngine_Authorize V3.19.0.1001
2+
3+
added:more system support
4+
added:storage log support and use to user pay
5+
added:set color for key log
6+
added:hardware code bind with login and register
7+
added:hardware bind switch app support
8+
added:serial expired time support
9+
added:http basic and digest support
10+
update:depend library
11+
update:match xengine last version
12+
improved:parameter command
13+
modify:adjust windows app list size
14+
modify:depend library directory name
15+
modify:start parameter are not case sensitive
16+
fixed:sometime configure read memory leak
17+
18+
增加:更新系统支持
19+
增加:强日志支持并且设置用户支付日志为强日志
20+
增加:设置关键日志输出颜色
21+
增加:支持登录注册硬件绑定
22+
增加:支持管理程序修改绑定登录注册
23+
增加:序列号过期支持
24+
增加:http接口基本和摘要验证
25+
更新:依赖库
26+
更新:匹配最新xengine版本
27+
优化:参数命令
28+
修改:调整管理程序窗口列表大小
29+
修改:依赖库目录名
30+
修改:启动参数不在区分大小写
31+
修正:某些时候配置读取内存溢出
32+
================================================================
133
XEngine_Authorize V3.18.0.1001
234

335
added:more system release support

‎README.en.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ feature list:
4949
17. announecement management
5050
18. support dynamic verifaction code
5151
19. support mulit login and merge time
52+
20. user bind hardware code
5253

5354
## install
5455

@@ -64,7 +65,7 @@ Linux Exection:sudo ./XEngine_LINEnv.sh -i 3
6465
Macos Exection:./XEngine_LINEnv.sh -i 3
6566

6667
#### sub module
67-
Due to the dependent sub-modules, after you checkout the warehouse, execute the following command in the warehouse directory to pull the sub-modules
68+
Due to the dependent sub-modules, after you checkout the resprepository, execute the following command in the resprepository directory to pull the sub-modules
6869
git submodule init
6970
git submodule update
7071

@@ -74,12 +75,10 @@ Just Run it,use XEngine_AuthorizeService
7475
XEngine_AuthorizeApp is pc management tools
7576

7677
#### Linux
77-
use makefile compile,UBUNTU22.04 or above
78-
Run it on the terminal,use XEngine_AuthorizeService
78+
use makefile compile,Run it on the terminal,use XEngine_AuthorizeService
7979

8080
#### Macos
81-
use makefile compile,mac 13 and above
82-
Run it on the terminal,use XEngine_AuthorizeService
81+
use makefile compile,Run it on the terminal,use XEngine_AuthorizeService
8382

8483
##### compile command
8584
execute command in XEngine_Source path
@@ -132,7 +131,7 @@ The V3 version is a new version, developed to meet the requirements of many envi
132131
## update guide
133132
Database update Use Navicat and other database software to open the judgment table and the different fields for modification
134133
After modification, directly copy the database to the new version to overwrite, and modify your configuration file
135-
3.11->3.12 A new time field has been added to the user table, please refer to the SQL file
134+
new db field for serial table by V3.19
136135

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

0 commit comments

Comments
 (0)