Skip to content

Commit 92334a0

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #57 from libxengine/develop
V3.17.0.1001 Merge
2 parents 1efea7d + 3e73f64 commit 92334a0

55 files changed

Lines changed: 977 additions & 588 deletions

Some content is hidden

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

‎.github/workflows/issue-translator.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Issue Translator
2+
on:
3+
issue_comment:
4+
types: [created]
5+
issues:
6+
types: [opened]
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: usthe/issues-translate-action@v2.7
13+
with:
14+
IS_MODIFY_TITLE: false
15+
CUSTOM_BOT_NOTE: Bot detected the issue body's language is not English, translate it automatically.

‎.github/workflows/linuxbuild.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
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+
# 设置依赖库的环境变量
43+
- name: Set up Dependency Environment Variables
44+
run: |
45+
cd libxengine
46+
chmod 777 *
47+
sudo ./XEngine_LINEnv.sh -i 3
48+
cd ..
49+
#编译
50+
- name: make
51+
run: |
52+
cd XEngine_Source
53+
make
54+
make FLAGS=InstallAll
55+
make FLAGS=CleanAll
56+
57+
make RELEASE=1
58+
make FLAGS=InstallAll
59+
make FLAGS=CleanAll
60+
cd ..
61+
- name: test
62+
run: |
63+
cd XEngine_Release
64+
./XEngine_XStorageApp -t

‎.github/workflows/macbuild.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
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+
# 设置依赖库的环境变量
42+
- name: Set up Dependency Environment Variables
43+
run: |
44+
cd libxengine
45+
chmod 777 *
46+
./XEngine_LINEnv.sh -i 3
47+
cd ..
48+
#编译
49+
- name: make debug
50+
run: |
51+
cd XEngine_Source
52+
make PLATFORM=mac
53+
make PLATFORM=mac FLAGS=InstallAll
54+
make PLATFORM=mac FLAGS=CleanAll
55+
- name: make release
56+
run: |
57+
cd XEngine_Source
58+
make PLATFORM=mac RELEASE=1
59+
make PLATFORM=mac FLAGS=InstallAll
60+
make PLATFORM=mac FLAGS=CleanAll
61+
- name: test
62+
run: |
63+
cd XEngine_Release
64+
./XEngine_XStorageApp -t

‎.github/workflows/msbuild.yml‎

Lines changed: 39 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,44 @@
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
34+
repository: libxengine/libxengine
2935
path: xengine
36+
37+
- name: sub module checkout (opensource)
38+
run: |
39+
git submodule init
40+
git submodule update
41+
shell: pwsh
3042

3143
# 设置依赖库的环境变量
3244
- name: Set up Dependency Environment Variables
@@ -42,61 +54,24 @@ jobs:
4254
#编译
4355
- name: Build Solution
4456
run: msbuild XEngine_Source/XEngine_StorageApp.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}
45-
46-
# 打包
47-
- name: Copy Build binaries for x86
57+
#测试
58+
- name: Conditional Step for x86 Release
59+
if: matrix.configuration == 'Release' && matrix.platform == 'x86'
4860
run: |
49-
mkdir -p "x86/XEngine_StorageApp"
50-
cp -r ./XEngine_Release/* x86/XEngine_StorageApp/
51-
cp -r ./XEngine_Source/Release/*.dll x86/XEngine_StorageApp/
52-
cp -r ./XEngine_Source/Release/*.exe x86/XEngine_StorageApp/
53-
cp -r ./XEngine_Source/VSCopy_x86.bat x86/XEngine_StorageApp/
54-
cd x86/XEngine_StorageApp && ./VSCopy_x86.bat
55-
cd ..
56-
cd ..
57-
7z a XEngine_StorageApp-x86-Windows.zip ./x86/XEngine_StorageApp/*
61+
cp -r XEngine_Source/Release/*.dll XEngine_Release/
62+
cp -r XEngine_Source/Release/*.exe XEngine_Release/
63+
cp -r XEngine_Source/VSCopy_x86.bat XEngine_Release/
64+
cd XEngine_Release
65+
./VSCopy_x86.bat
66+
./XEngine_StorageApp.exe -t
5867
shell: pwsh
59-
60-
- name: Calculate new tag
61-
id: newtag
62-
shell: bash
68+
- name: Conditional Step for x86 Debug
69+
if: matrix.configuration == 'Debug' && matrix.platform == 'x86'
6370
run: |
64-
git fetch --tags
65-
TAG=$(git tag --sort=-v:refname | head -n 1)
66-
MAJOR=$(echo $TAG | cut -d '.' -f 1)
67-
MINOR=$(echo $TAG | cut -d '.' -f 2)
68-
PATCH=$(echo $TAG | cut -d '.' -f 3)
69-
BUILD=$(echo $TAG | cut -d '.' -f 4)
70-
MINOR_BUMP=$((MINOR + 1))
71-
NEW_TAG="${MAJOR}.${MINOR_BUMP}.0.${BUILD}"
72-
echo "NEW_TAG=$NEW_TAG" >> $GITHUB_ENV
73-
git config --local user.email "action@github.com"
74-
git config --local user.name "GitHub Action"
75-
git tag $NEW_TAG
76-
git push origin $NEW_TAG
77-
78-
# 创建GitHub Release
79-
- name: Create Release
80-
id: create_release
81-
uses: softprops/action-gh-release@v1
82-
with:
83-
tag_name: ${{ env.NEW_TAG }}
84-
name: Release ${{ env.NEW_TAG }}
85-
body: |
86-
[${{ github.sha }}](https://github.com/libxengine/XEngine_Storage/commit/${{ github.sha }})
87-
${{ github.event.head_commit.message }}
88-
draft: false
89-
prerelease: false
90-
env:
91-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
92-
93-
# 上传x86的zip包作为发布的artifacts
94-
- name: Upload x86 Release Asset
95-
uses: actions/upload-release-asset@v1
96-
env:
97-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
98-
with:
99-
upload_url: ${{ steps.create_release.outputs.upload_url }}
100-
asset_path: ./XEngine_StorageApp-x86-Windows.zip
101-
asset_name: XEngine_StorageApp-x86-Windows.zip
102-
asset_content_type: application/zip
71+
cp -r XEngine_Source/Debug/*.dll XEngine_Release/
72+
cp -r XEngine_Source/Debug/*.exe XEngine_Release/
73+
cp -r XEngine_Source/VSCopy_x86.bat XEngine_Release/
74+
cd XEngine_Release
75+
./VSCopy_x86.bat
76+
./XEngine_StorageApp.exe -t
77+
shell: pwsh

‎CHANGELOG‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
XEngine_Storage V3.17.0.1001
2+
3+
added:workflows support
4+
added:start test parameter supported
5+
added:crash core-dump support for windows
6+
added:implement encryption and decryption for http basic and digest
7+
update:sub module library
8+
improved:start parameter parse
9+
modify:enum file function match to xengine v8.42
10+
modify:The upload speed limit is now processed using a new mode, network events + algorithm events, and will not affect other network clients
11+
fixed:build error on mac os
12+
fixed:vs Problems with incorrect generation order
13+
fixed:crash when exist service
14+
delete:user local authorize and just use proxy api authorize
15+
16+
增加:工作流支持
17+
增加:启动参数测试支持
18+
增加:windows coredump支持
19+
增加:HTTP基本和摘要加解密实现
20+
更新:子模块支持库
21+
优化:启动参数优化
22+
修改:匹配了代码库版本到XEngine V8.42
23+
修改:上传限速使用了新的方法,网络事件+算法事件,不会影响其他客户端了
24+
修正:mac系统编译问题
25+
修正:生成顺序问题
26+
修正:某些时候退出崩溃问题
27+
删除:本地验证支持并且验证只使用代理授权验证
28+
======================================================================================
29+
XEngine_Storage V3.16.0.1001
30+
31+
增加:上传接口文件准备支持
32+
增加:webdav协议支持:OPTIONS POST GET PUT PROPFIND PROPPATCH DELETE LOCK UNLOCK
33+
增加:XML的子模块
34+
修正:可能跳过存储KEY名称的错误返回
35+
修正:APIHelp_Distributed_DLStorage 某些时候文件名称和key不正确导致的问题
36+
37+
added:upload create ready supported
38+
added:webdav protocol support:OPTIONS POST GET PUT PROPFIND PROPPATCH DELETE LOCK UNLOCK
39+
add:xml module form sub module
40+
fixed:maybe return error bucket when input mistake storage key
41+
fixed:APIHelp_Distributed_DLStorage sometime is file name and key is incorrect
42+
======================================================================================
143
XEngine_Storage V3.15.0.1001
244

345
增加:用户上传下载动作支持

‎README.en.md‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ feature list:
2222
5. support load banace
2323
6. supprot http auth
2424
7. support log and config
25-
8. supprot speeds contral
25+
8. Support multi-threaded file upload and download
2626
9. supprot task start and end proxy forwarding
2727
10. support p2p
2828
11. bt protocol
@@ -40,11 +40,11 @@ feature list:
4040

4141
#### XEngine Evn
4242
you must install XEngine,need V8.10 or above,install XEngine can be refer to xengine Readme docment
43-
GITEE:https://gitee.com/xyry/libxengine
44-
GITHUB:https://github.com/libxengine/xengine
43+
GITEE:https://gitee.com/libxengine/libxengine
44+
GITHUB:https://github.com/libxengine/libxengine
4545

4646
##### fast to deployment
47-
git clone https://gitee.com/xyry/libxengine.git or git clone https://github.com/libxengine/xengine.git
47+
git clone https://gitee.com/libxengine/libxengine.git or git clone https://github.com/libxengine/libxengine.git
4848
window Exection XEngine_WINEnv.bat
4949
Linux Exection:sudo ./XEngine_LINEnv.sh -i 3
5050
Macos Exection:./XEngine_LINEnv.sh -i 3
@@ -104,9 +104,6 @@ P2P distributed download is the same as the hyper-threaded download of other dow
104104
UPLoad File: curl -d 'hello xengine' -X POST "http://192.168.1.8:5102/api?filename=hello.txt&storeagekey=storagekey1"
105105
Download File: curl -X GET "http://192.168.1.8:5101/storagekey1/hello.txt"
106106

107-
## now task
108-
P2P WAN file search and download support
109-
110107
## Installation Instructions
111108
#### Install
112109
Modify the configuration file to what you need, and then run the service directly

0 commit comments

Comments
 (0)