Skip to content

Commit 9cae1ac

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #30 from libxengine/develop
V3.7.0.1001
2 parents 64c8d1f + 65bbbab commit 9cae1ac

File tree

42 files changed

+494
-150
lines changed

Some content is hidden

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

42 files changed

+494
-150
lines changed

‎.github/workflows/linuxbuild.yml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: ubuntu build workflows
2+
3+
on:
4+
push:
5+
branches: [ "develop" ]
6+
pull_request:
7+
branches: [ "develop" ]
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
build:
14+
strategy:
15+
# Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
16+
fail-fast: false
17+
matrix:
18+
include:
19+
- os: ubuntu-22.04
20+
#- os: ubuntu-24.04
21+
runs-on: ${{ matrix.os }}
22+
23+
steps:
24+
# 检出您的主仓库代码
25+
- name: Checkout main repository code
26+
uses: actions/checkout@v4
27+
with:
28+
ref: 'develop'
29+
30+
# 检出依赖的xengine仓库到指定的xengine目录
31+
- name: Checkout dependency repository (xengine)
32+
uses: actions/checkout@v4
33+
with:
34+
repository: libxengine/libxengine
35+
path: libxengine
36+
37+
- name: sub module checkout (opensource)
38+
run: |
39+
git submodule init
40+
git submodule update
41+
42+
- name: install library
43+
run: sudo apt install liblua5.4-dev libopencv-dev libopencv-contrib-dev libqrencode-dev
44+
45+
# 设置依赖库的环境变量
46+
- name: Set up Dependency Environment Variables
47+
run: |
48+
cd libxengine
49+
chmod 777 *
50+
sudo ./XEngine_LINEnv.sh -i 3
51+
cd ..
52+
#编译
53+
- name: make
54+
run: |
55+
cd XEngine_Source
56+
make
57+
make FLAGS=InstallAll
58+
make FLAGS=CleanAll
59+
60+
make RELEASE=1
61+
make FLAGS=InstallAll
62+
make FLAGS=CleanAll
63+
cd ..
64+
- name: test
65+
run: |
66+
cd XEngine_Release
67+
./XEngine_APIServiceApp -t

‎.github/workflows/macbuild.yml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: macos build workflows
2+
3+
on:
4+
push:
5+
branches: [ "develop" ]
6+
pull_request:
7+
branches: [ "develop" ]
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
build:
14+
strategy:
15+
matrix:
16+
include:
17+
- os: macos-13
18+
runs-on: ${{ matrix.os }}
19+
20+
steps:
21+
- name: Checkout main repository code
22+
uses: actions/checkout@v4
23+
with:
24+
ref: 'develop'
25+
26+
# 检出依赖的xengine仓库到指定的xengine目录
27+
- name: Checkout dependency repository (xengine)
28+
uses: actions/checkout@v4
29+
with:
30+
repository: libxengine/libxengine
31+
path: libxengine
32+
33+
- name: sub module checkout (opensource)
34+
run: |
35+
git submodule init
36+
git submodule update
37+
38+
- name: brew install
39+
run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
40+
41+
- name: install library
42+
run: |
43+
brew install lua opencv qrencode
44+
brew list opencv
45+
brew info opencv
46+
47+
# 设置依赖库的环境变量
48+
- name: Set up Dependency Environment Variables
49+
run: |
50+
cd libxengine
51+
chmod 777 *
52+
./XEngine_LINEnv.sh -i 3
53+
cd ..
54+
#编译
55+
- name: make debug
56+
run: |
57+
cd XEngine_Source
58+
make PLATFORM=mac
59+
make PLATFORM=mac FLAGS=InstallAll
60+
make PLATFORM=mac FLAGS=CleanAll
61+
- name: make release
62+
run: |
63+
cd XEngine_Source
64+
make PLATFORM=mac RELEASE=1
65+
make PLATFORM=mac FLAGS=InstallAll
66+
make PLATFORM=mac FLAGS=CleanAll
67+
- name: test
68+
run: |
69+
cd XEngine_Release
70+
./XEngine_APIServiceApp -t

‎.github/workflows/msbuild.yml‎

Lines changed: 71 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,102 @@
1-
name: C++ Build with Dependencies
1+
name: windows build workflows
22

3-
#on: [push] # 触发条件，推送和拉取请求时，
43
on:
5-
workflow_dispatch: # 添加这行来启用手动触发
4+
push:
5+
branches: [ "develop" ]
6+
pull_request:
7+
branches: [ "develop" ]
68

79
permissions:
8-
contents: write
10+
contents: read
911

1012
jobs:
1113
build:
1214
strategy:
15+
# Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
16+
fail-fast: false
1317
matrix:
14-
configuration: [Release]
15-
platform: [x86]
18+
configuration: [Debug ,Release]
19+
platform: [x86 ,x64]
1620

1721
runs-on: windows-latest # 最新的 Windows 环境
1822

1923
steps:
2024
# 检出您的主仓库代码
2125
- name: Checkout main repository code
22-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
27+
with:
28+
ref: 'develop'
2329

2430
# 检出依赖的xengine仓库到指定的xengine目录
2531
- name: Checkout dependency repository (xengine)
26-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
2733
with:
28-
repository: libxengine/xengine
29-
path: xengine
34+
repository: libxengine/libxengine
35+
path: libxengine
36+
37+
- name: sub module checkout (opensource)
38+
run: |
39+
git submodule init
40+
git submodule update
41+
shell: pwsh
3042

31-
- name: Checkout dependency repository (vcpkg)
32-
uses: actions/checkout@v3
43+
- name: vcpkg dependency repository
44+
uses: actions/checkout@v4
3345
with:
34-
repository: https://github.com/microsoft/vcpkg.git
35-
path: vcpkg
46+
repository: microsoft/vcpkg
47+
path: vcpkg
48+
49+
- name: vcpkg install (x86)
50+
if: matrix.platform == 'x86'
51+
run: |
52+
cd vcpkg
53+
./bootstrap-vcpkg.bat
54+
./vcpkg.exe install lua:x86-windows opencv[contrib]:x86-windows libqrencode:x86-windows
55+
./vcpkg.exe integrate install
56+
shell: pwsh
57+
- name: vcpkg install (x64)
58+
if: matrix.platform == 'x64'
59+
run: |
60+
cd vcpkg
61+
./bootstrap-vcpkg.bat
62+
./vcpkg.exe install lua:x64-windows opencv[contrib]:x64-windows libqrencode:x64-windows
63+
./vcpkg.exe integrate install
64+
shell: pwsh
3665

3766
# 设置依赖库的环境变量
3867
- name: Set up Dependency Environment Variables
3968
run: |
40-
echo "XENGINE_INCLUDE=${{ github.workspace }}/xengine" | Out-File -FilePath $env:GITHUB_ENV -Append
41-
echo "XENGINE_LIB32=${{ github.workspace }}/xengine/XEngine_Windows/x86" | Out-File -FilePath $env:GITHUB_ENV -Append
42-
echo "XENGINE_LIB64=${{ github.workspace }}/xengine/XEngine_Windows/x64" | Out-File -FilePath $env:GITHUB_ENV -Append
69+
echo "XENGINE_INCLUDE=${{ github.workspace }}/libxengine" | Out-File -FilePath $env:GITHUB_ENV -Append
70+
echo "XENGINE_LIB32=${{ github.workspace }}/libxengine/XEngine_Windows/x86" | Out-File -FilePath $env:GITHUB_ENV -Append
71+
echo "XENGINE_LIB64=${{ github.workspace }}/libxengine/XEngine_Windows/x64" | Out-File -FilePath $env:GITHUB_ENV -Append
4372
shell: pwsh
73+
- name: Set code page
74+
run: chcp 65001
4475

4576
# 配置 MSBuild 的路径，准备构建 VC++ 项目
4677
- name: Setup MSBuild
47-
uses: microsoft/setup-msbuild@v1.0.2
78+
uses: microsoft/setup-msbuild@v2
4879
#编译
4980
- name: Build Solution
50-
run: msbuild XEngine_Source/XEngine.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}
81+
run: msbuild XEngine_Source/XEngine.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }} /p:AdditionalOptions="/utf-8"
82+
#测试
83+
- name: Conditional Step for x86 Release
84+
if: matrix.configuration == 'Release' && matrix.platform == 'x86'
85+
run: |
86+
cp -r XEngine_Source/Release/*.dll XEngine_Release/
87+
cp -r XEngine_Source/Release/*.exe XEngine_Release/
88+
cp -r XEngine_Source/VSCopy_x86.bat XEngine_Release/
89+
cd XEngine_Release
90+
./VSCopy_x86.bat
91+
./XEngine_HttpApp.exe -t
92+
shell: pwsh
93+
- name: Conditional Step for x86 Debug
94+
if: matrix.configuration == 'Debug' && matrix.platform == 'x86'
95+
run: |
96+
cp -r XEngine_Source/Debug/*.dll XEngine_Release/
97+
cp -r XEngine_Source/Debug/*.exe XEngine_Release/
98+
cp -r XEngine_Source/VSCopy_x86.bat XEngine_Release/
99+
cd XEngine_Release
100+
./VSCopy_x86.bat
101+
./XEngine_HttpApp.exe -t
102+
shell: pwsh

‎CHANGELOG‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
XEngine_APIService V3.7.0.1001
2+
3+
增加:windows的coredump支持
4+
增加:工作流支持
5+
增加:启动测试参数支持
6+
更新:匹配XEngine V8.40版本
7+
更新:子模块
8+
修改:modify:XENGIEN_APISERVICE_BUFFER_SIZE 替换为 XENGINE_MEMORY_SIZE_MAX
9+
修改:生成顺序调整
10+
修改:p2p刻度爱你管理支持禁用了
11+
修正:mac和linux系统下构建错误
12+
修正:头文件缺失
13+
修正:后台服务http下载状态处理错误
14+
修正:机器信息日志打印错误
15+
修正:禁用插件没有作用的问题
16+
17+
added:windows core dump generator support
18+
added:workflows support
19+
added:start test support
20+
update:match xengine v8.40
21+
update:sub module
22+
modify:XENGIEN_APISERVICE_BUFFER_SIZE instead XENGINE_MEMORY_SIZE_MAX
23+
modify:generation sequence
24+
modify:p2p client management support disable
25+
fixed:build error on mac and linux
26+
fixed:header file lost
27+
fixed:http download status process failed for back service
28+
fixed:log print info incorrect for machine info
29+
fixed:does not work when disable plugin
30+
======================================================================================
131
XEngine_APIService V3.6.0.1001
232

333
增加:mac地址供应商查询

‎README.en.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ Support privatization deployment, free, safe, open source, controllable
6060

6161
#### XEngine Evn
6262
you must install XEngine,need V8.x or above,install XEngine can be refer to xengine Readme docment
63-
GITEE:https://gitee.com/xyry/libxengine
64-
GITHUB:https://github.com/libxengine/xengine
63+
GITEE:https://gitee.com/libxengine/libxengine
64+
GITHUB:https://github.com/libxengine/libxengine
6565

6666
##### fast to deployment
67-
git clone https://gitee.com/xyry/libxengine.git or git clone https://github.com/libxengine/xengine.git
67+
git clone https://gitee.com/libxengine/libxengine.git or git clone https://github.com/libxengine/libxengine.git
6868
window Exection XEngine_WINEnv.bat
6969
Linux Exection:sudo ./XEngine_LINEnv.sh -i 3
7070
Macos Exection:./XEngine_LINEnv.sh -i 3

‎README.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ c c++ interface api service
5959

6060
#### XEngine环境
6161
必须安装XEngine,版本需要V8.x或者以上版本,安装XEngine可以参考其Readme文档
62-
GITEE:https://gitee.com/xyry/libxengine
63-
GITHUB:https://github.com/libxengine/xengine
62+
GITEE:https://gitee.com/libxengine/libxengine
63+
GITHUB:https://github.com/libxengine/libxengine
6464

6565
###### 快速部署
66-
git clone https://gitee.com/xyry/libxengine.git 或者 git clone https://github.com/libxengine/xengine.git
66+
git clone https://gitee.com/libxengine/libxengine.git 或者 git clone https://github.com/libxengine/libxengine.git
6767
window执行XEngine_WINEnv.bat 脚本.
6868
Linux执行:sudo ./XEngine_LINEnv.sh -i 3
6969
macos执行:./XEngine_LINEnv.sh -i 3
@@ -76,6 +76,10 @@ macos执行:./XEngine_LINEnv.sh -i 3
7676
由于依赖的子模块,在你checkout仓库后,在仓库目录下执行下面的命令拉取子模块
7777
git submodule init
7878
git submodule update
79+
如果github访问失败,你也可以clone该项目,在主目录下使用命令:
80+
git clone https://gitee.com/xengine/XEngine_OPenSource.git XEngine_Source/XEngine_Depend
81+
git clone https://gitee.com/xengine/XEngine_IPMacData.git XEngine_Source/XEngine_DBDepend/XEngine_IPMacData
82+
git clone https://gitee.com/xengine/XEngine_PhoneData.git XEngine_Source/XEngine_DBDepend/XEngine_PhoneData
7983

8084
#### Windows
8185
需要vcpkg配置第三方环境,具体参考vcpkg安装方式,安装好后执行:vcpkg.exe install lua:x86-windows opencv[contrib]:x86-windows libqrencode:x86-windows lua:x64-windows opencv[contrib]:x64-windows libqrencode:x64-windows

‎XEngine_APPClient/APPClient_MachineExample/APPClient_MachineExample.cpp‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ int test_insert()
4444

4545
Json::Value st_JsonRoot;
4646
Json::StreamWriterBuilder st_JsonBuilder;
47+
st_JsonRoot["tszServiceName"] = "XEngine_TestApp";
4748
st_JsonRoot["tszMachineName"] = tszOSName;
49+
st_JsonRoot["tszMachineUser"] = "user";
4850
st_JsonRoot["tszMachineCode"] = st_SDKSerial.tszSystemSerial;
4951
st_JsonRoot["tszMachineSystem"] = tszComputerName;
5052

@@ -65,7 +67,7 @@ int test_list()
6567
{
6668
int nLen = 0;
6769
int nCode = 0;
68-
LPCXSTR lpszAPIUrl = _X("http://127.0.0.1:5501/api?function=machine&params1=2");
70+
LPCXSTR lpszAPIUrl = _X("http://127.0.0.1:5501/api?function=machine&params1=3");
6971

7072
XCHAR* ptszMsgBuffer = NULL;
7173
if (!APIClient_Http_Request(_X("POST"), lpszAPIUrl, NULL, &nCode, &ptszMsgBuffer, &nLen))
@@ -84,11 +86,12 @@ int test_delete()
8486
int nCode = 0;
8587
LPCXSTR lpszAPIUrl = _X("http://127.0.0.1:5501/api?function=machine&params1=1");
8688

87-
SYSTEMAPI_SERIAL_INFOMATION st_SDKSerial = {};
88-
SystemApi_HardWare_GetSerial(&st_SDKSerial);
89+
XCHAR tszComputerName[128] = {};
90+
SystemApi_System_GetSysName(NULL, tszComputerName);
8991

9092
Json::Value st_JsonRoot;
91-
st_JsonRoot["tszMachineCode"] = st_SDKSerial.tszSystemSerial;
93+
st_JsonRoot["tszServiceName"] = "XEngine_TestApp";
94+
st_JsonRoot["tszMachineSystem"] = tszComputerName;
9295

9396
XCHAR* ptszMsgBuffer = NULL;
9497
if (!APIClient_Http_Request(_X("POST"), lpszAPIUrl, st_JsonRoot.toStyledString().c_str(), &nCode, &ptszMsgBuffer, &nLen))

‎XEngine_Release/XEngine_Config/XEngine_VersionConfig.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"XVer":[
3+
"3.7.0.1001 Build20240927",
34
"3.6.0.1001 Build20240705",
45
"3.5.0.1001 Build20240510",
56
"3.4.0.1001 Build20240411",

‎XEngine_Release/XEngine_Coredump/.gitignore‎

Whitespace-only changes.

‎XEngine_Release/XEngine_DBFile/macaddr.xdb‎

310 KB
Binary file not shown.

0 commit comments

Comments
 (0)