Skip to content

Commit 082b27c

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #43 from libxengine/develop
V3.12 Merge
2 parents baa012f + 1c165ea commit 082b27c

File tree

58 files changed

+669
-697
lines changed

Some content is hidden

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

58 files changed

+669
-697
lines changed

‎.github/workflows/Rocky_build.yml‎

Lines changed: 26 additions & 11 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.os_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+
os_version: 9
29+
- arch: amd64
30+
runner: ubuntu-24.04
31+
platform: linux/amd64
32+
artifact: x86-64
33+
os_version: 10
2834
- arch: arm64
2935
runner: ubuntu-24.04-arm
3036
platform: linux/arm64
3137
artifact: Arm64
38+
os_version: 9
39+
- arch: arm64
40+
runner: ubuntu-24.04-arm
41+
platform: linux/arm64
42+
artifact: Arm64
43+
os_version: 10
3244

3345
steps:
3446
- name: Checkout main repository code
@@ -46,36 +58,39 @@ 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/XEngine_OPenSource
5062
- name: sub module checkout (XEngine_PhoneData)
5163
uses: actions/checkout@v4
5264
with:
5365
repository: libxengine/XEngine_PhoneData
54-
path: XEngine_Source/XEngine_DBDepend/XEngine_PhoneData
66+
path: XEngine_Source/XEngine_DependLibrary/XEngine_PhoneData
5567
- name: sub module checkout (XEngine_IPMacData)
5668
uses: actions/checkout@v4
5769
with:
5870
repository: libxengine/XEngine_IPMacData
59-
path: XEngine_Source/XEngine_DBDepend/XEngine_IPMacData
60-
71+
path: XEngine_Source/XEngine_DependLibrary/XEngine_IPMacData
72+
6173
- name: Set TERM variable
6274
run: echo "TERM=xterm" >> $GITHUB_ENV
6375

6476
- name: install system package
6577
run: |
78+
dnf clean all
79+
dnf makecache
80+
dnf distro-sync -y
6681
dnf update -y
6782
dnf install gcc g++ make git jq unzip wget -y
68-
83+
6984
- name: install xengine library
7085
run: |
7186
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_9_${{ matrix.artifact }}.zip
73-
unzip ./XEngine_RockyLinux_9_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_9_${{ matrix.artifact }}
74-
cd XEngine_RockyLinux_9_${{ matrix.artifact }}
87+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_${{ matrix.os_version }}_${{ matrix.artifact }}.zip
88+
unzip ./XEngine_RockyLinux_${{ matrix.os_version }}_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_${{ matrix.os_version }}_${{ matrix.artifact }}
89+
cd XEngine_RockyLinux_${{ matrix.os_version }}_${{ matrix.artifact }}
7590
7691
chmod 777 *
7792
./XEngine_LINEnv.sh -i 3
78-
93+
dnf install libavdevice -y
7994
- name: install build package
8095
run: |
8196
dnf install lua-devel opencv-devel qrencode-devel leptonica-devel tesseract-devel -y
@@ -100,6 +115,6 @@ jobs:
100115
- name: Upload folder as artifact with RockyLinux
101116
uses: actions/upload-artifact@v4
102117
with:
103-
name: XEngine_APIServiceApp-RockyLinux_9_${{ matrix.artifact }}
118+
name: XEngine_APIServiceApp-RockyLinux_${{ matrix.os_version }}_${{ matrix.artifact }}
104119
path: XEngine_Release/
105120
retention-days: 1

‎.github/workflows/debian_build.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,25 @@ jobs:
3838
repository: libxengine/libxengine
3939
path: libxengine
4040

41+
- name: Set TERM variable
42+
run: echo "TERM=xterm" >> $GITHUB_ENV
43+
4144
- name: sub module checkout (XEngine_OPenSource)
4245
uses: actions/checkout@v4
4346
with:
4447
repository: libxengine/XEngine_OPenSource
45-
path: XEngine_Source/XEngine_Depend
48+
path: XEngine_Source/XEngine_DependLibrary/XEngine_OPenSource
4649
- name: sub module checkout (XEngine_PhoneData)
4750
uses: actions/checkout@v4
4851
with:
4952
repository: libxengine/XEngine_PhoneData
50-
path: XEngine_Source/XEngine_DBDepend/XEngine_PhoneData
53+
path: XEngine_Source/XEngine_DependLibrary/XEngine_PhoneData
5154
- name: sub module checkout (XEngine_IPMacData)
5255
uses: actions/checkout@v4
5356
with:
5457
repository: libxengine/XEngine_IPMacData
55-
path: XEngine_Source/XEngine_DBDepend/XEngine_IPMacData
58+
path: XEngine_Source/XEngine_DependLibrary/XEngine_IPMacData
5659

57-
- name: Set TERM variable
58-
run: echo "TERM=xterm" >> $GITHUB_ENV
59-
6060
- name: install system package
6161
run: |
6262
apt update -y

‎.github/workflows/fedora_build.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ jobs:
3535
steps:
3636
- name: Checkout main repository code
3737
uses: actions/checkout@v4
38+
with:
39+
ref: 'develop'
3840

3941
- name: Checkout dependency repository (xengine)
4042
uses: actions/checkout@v4
@@ -46,18 +48,18 @@ jobs:
4648
uses: actions/checkout@v4
4749
with:
4850
repository: libxengine/XEngine_OPenSource
49-
path: XEngine_Source/XEngine_Depend
51+
path: XEngine_Source/XEngine_DependLibrary/XEngine_OPenSource
5052
- name: sub module checkout (XEngine_PhoneData)
5153
uses: actions/checkout@v4
5254
with:
5355
repository: libxengine/XEngine_PhoneData
54-
path: XEngine_Source/XEngine_DBDepend/XEngine_PhoneData
56+
path: XEngine_Source/XEngine_DependLibrary/XEngine_PhoneData
5557
- name: sub module checkout (XEngine_IPMacData)
5658
uses: actions/checkout@v4
5759
with:
5860
repository: libxengine/XEngine_IPMacData
59-
path: XEngine_Source/XEngine_DBDepend/XEngine_IPMacData
60-
61+
path: XEngine_Source/XEngine_DependLibrary/XEngine_IPMacData
62+
6163
- name: install system package
6264
run: |
6365
dnf update -y

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fetch-depth: 0
1818

1919
- name: Download ubuntu build
20-
uses: dawidd6/action-download-artifact@v6
20+
uses: dawidd6/action-download-artifact@v11
2121
with:
2222
workflow: Ubuntu_build.yml
2323
workflow_conclusion: success
@@ -26,7 +26,7 @@ jobs:
2626
if_no_artifact_found: fail
2727
path: ./XRelease/
2828
- name: Download debian build
29-
uses: dawidd6/action-download-artifact@v6
29+
uses: dawidd6/action-download-artifact@v11
3030
with:
3131
workflow: debian_build.yml
3232
workflow_conclusion: success
@@ -35,7 +35,7 @@ jobs:
3535
if_no_artifact_found: fail
3636
path: ./XRelease/
3737
- name: Download fedora build
38-
uses: dawidd6/action-download-artifact@v6
38+
uses: dawidd6/action-download-artifact@v11
3939
with:
4040
workflow: fedora_build.yml
4141
workflow_conclusion: success
@@ -44,7 +44,7 @@ jobs:
4444
if_no_artifact_found: fail
4545
path: ./XRelease/
4646
- name: Download Rocky build
47-
uses: dawidd6/action-download-artifact@v6
47+
uses: dawidd6/action-download-artifact@v11
4848
with:
4949
workflow: Rocky_build.yml
5050
workflow_conclusion: success
@@ -53,7 +53,7 @@ jobs:
5353
if_no_artifact_found: fail
5454
path: ./XRelease/
5555
- name: Download macbuild
56-
uses: dawidd6/action-download-artifact@v6
56+
uses: dawidd6/action-download-artifact@v11
5757
with:
5858
workflow: macbuild.yml
5959
workflow_conclusion: success
@@ -62,7 +62,7 @@ jobs:
6262
if_no_artifact_found: fail
6363
path: ./XRelease/
6464
- name: Download msbuild
65-
uses: dawidd6/action-download-artifact@v6
65+
uses: dawidd6/action-download-artifact@v11
6666
with:
6767
workflow: msbuild.yml
6868
workflow_conclusion: success

‎.gitmodules‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
[submodule "XEngine_Source/XEngine_Depend"]
2-
path = XEngine_Source/XEngine_Depend
1+
[submodule "XEngine_Source/XEngine_DependLibrary/XEngine_OPenSource"]
2+
path = XEngine_Source/XEngine_DependLibrary/XEngine_OPenSource
33
url = https://github.com/libxengine/XEngine_OPenSource.git
4-
[submodule "XEngine_Source/XEngine_DBDepend/phonedata"]
5-
path = XEngine_Source/XEngine_DBDepend/XEngine_PhoneData
6-
url = https://github.com/libxengine/XEngine_PhoneData.git
7-
[submodule "XEngine_Source/XEngine_DBDepend/XEngine_IPMacData"]
8-
path = XEngine_Source/XEngine_DBDepend/XEngine_IPMacData
4+
[submodule "XEngine_Source/XEngine_DependLibrary/XEngine_IPMacData"]
5+
path = XEngine_Source/XEngine_DependLibrary/XEngine_IPMacData
96
url = https://github.com/libxengine/XEngine_IPMacData.git
7+
[submodule "XEngine_Source/XEngine_DependLibrary/XEngine_PhoneData"]
8+
path = XEngine_Source/XEngine_DependLibrary/XEngine_PhoneData
9+
url = https://github.com/libxengine/XEngine_PhoneData.git

‎CHANGELOG‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
XEngine_APIService V3.12.0.1001
2+
3+
增加:rockylinux 10 支持
4+
增加:后台服务完成通知
5+
增加:macos屏幕录像
6+
优化:大内存操作统一采用内存池
7+
修改:内存缓冲警告和优化
8+
修改:调整信息获取和存储方法
9+
修改:git的子模块目录修改
10+
修改:可以为后台服务报告api完成信息了
11+
修正:后台服务下载操作问题
12+
修正:后台服务上传文件无效
13+
修正:屏幕推流不工作
14+
删除:不需要的后台编码句柄
15+
16+
added:rocky linux 10 support
17+
added:completed notify for back service
18+
added:record screen macos support
19+
improved:All large memory operations use memory pool instead
20+
modify:memory buffer warn and improved
21+
modify:Adjust the information acquisition and storage method
22+
modify:git submodule move to new dir
23+
modify:create new field for api address report for back service
24+
fixed:download operator not work for back service protocol
25+
fixed:upload file not work for back service
26+
fixed:screen stream push not work
27+
delete:audio and video encoder code for back service
28+
======================================================================================
129
XEngine_APIService V3.11.0.1001
230

331
增加:更多发布系统支持

‎README.en.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ It allows you to save 90% of information service costs in a year.
5858
35. NTP Time Sync Protocol
5959
36. mac address vendor query
6060
37. ORC Get TEXT With image
61+
38. P2P
6162

6263
## install
6364

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ c c++ interface api service
6161
35. NTP时间同步协议
6262
36. 支持MAC地址厂商查询
6363
37. ORC图像文本提取
64+
38. P2P
6465

6566
## 安装教程
6667

‎XEngine_Docment/Docment_en.docx‎

5.52 KB
Binary file not shown.

‎XEngine_Docment/Docment_zh.docx‎

2.41 KB
Binary file not shown.

0 commit comments

Comments
 (0)