Skip to content

Commit 470ace1

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #35 from libxengine/develop
V3.14.0.1001 Merge
2 parents 2bb43d2 + 1839676 commit 470ace1

File tree

64 files changed

+4361
-75
lines changed

Some content is hidden

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

64 files changed

+4361
-75
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Screenshots**
24+
If applicable, add screenshots to help explain your problem.
25+
26+
**Desktop (please complete the following information):**
27+
- OS: [e.g. iOS]
28+
- Browser [e.g. chrome, safari]
29+
- Version [e.g. 22]
30+
31+
**Smartphone (please complete the following information):**
32+
- Device: [e.g. iPhone6]
33+
- OS: [e.g. iOS8.1]
34+
- Browser [e.g. stock browser, safari]
35+
- Version [e.g. 22]
36+
37+
**Additional context**
38+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎CHANGELOG

+22
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
XEngine_Storage V3.14.0.1001
2+
3+
增加:默认SSL的KEY文件
4+
增加:BT协议模块(支持解析,创建和下载BT种子)
5+
增加:信息报告模块,可以上报信息和查询
6+
修改:定义http请求的类型修改为const char *类型
7+
修改:ssl类型现在采取默认tls了
8+
修改:ssl支持多类型证书了
9+
修改:配置文件逻辑型从int都改成bool了
10+
修正:读取ssl配置不正确的问题
11+
删除:没有使用的center相关代码
12+
13+
added:default ssl key
14+
added:bt protocol module
15+
added:info report module
16+
modify:define http request type modify to const char *
17+
modify:ssl type default only tls now
18+
modify:ssl support multi type cert
19+
modify:boolean type to asbool from asint for configure
20+
fixed:read ssl configure is incorrect
21+
delete:unused code for center
22+
======================================================================================
123
XEngine_Storage V3.13.0.1001
224

325
增加:st_PermissionFlags增加新的标志位上传限制,现在上传文件也可以进行限制了

‎CODE_OF_CONDUCT.md

+128
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, religion, or sexual identity
10+
and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the
26+
overall community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email
35+
address, without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
[email protected].
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Correction
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A private, written warning from community leaders, providing
80+
clarity around the nature of the violation and an explanation of why the
81+
behavior was inappropriate. A public apology may be requested.
82+
83+
### 2. Warning
84+
85+
**Community Impact**: A violation through a single incident or series
86+
of actions.
87+
88+
**Consequence**: A warning with consequences for continued behavior. No
89+
interaction with the people involved, including unsolicited interaction with
90+
those enforcing the Code of Conduct, for a specified period of time. This
91+
includes avoiding interactions in community spaces as well as external channels
92+
like social media. Violating these terms may lead to a temporary or
93+
permanent ban.
94+
95+
### 3. Temporary Ban
96+
97+
**Community Impact**: A serious violation of community standards, including
98+
sustained inappropriate behavior.
99+
100+
**Consequence**: A temporary ban from any sort of interaction or public
101+
communication with the community for a specified period of time. No public or
102+
private interaction with the people involved, including unsolicited interaction
103+
with those enforcing the Code of Conduct, is allowed during this period.
104+
Violating these terms may lead to a permanent ban.
105+
106+
### 4. Permanent Ban
107+
108+
**Community Impact**: Demonstrating a pattern of violation of community
109+
standards, including sustained inappropriate behavior, harassment of an
110+
individual, or aggression toward or disparagement of classes of individuals.
111+
112+
**Consequence**: A permanent ban from any sort of public interaction within
113+
the community.
114+
115+
## Attribution
116+
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.0, available at
119+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
120+
121+
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122+
enforcement ladder](https://github.com/mozilla/diversity).
123+
124+
[homepage]: https://www.contributor-covenant.org
125+
126+
For answers to common questions about this code of conduct, see the FAQ at
127+
https://www.contributor-covenant.org/faq. Translations are available at
128+
https://www.contributor-covenant.org/translations.

‎README.en.md

+7-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ feature list:
2525
8. supprot speeds contral
2626
9. supprot task start and end proxy forwarding
2727
10. support p2p
28-
11. bt(planning)
28+
11. bt protocol
2929
12. data distributed
3030
13. support second pass and Resumable
3131
14. support upload and download Redirect
@@ -49,15 +49,18 @@ Macos Exection:./XEngine_LINEnv.sh -i 3
4949

5050
#### Windows
5151
use vs open and compile,suport windows 7sp1 and above
52-
Just Run it,use XEngine_AuthorizeApp
52+
Just Run it,use XEngine_AuthorizeApp
53+
if you need bt protocol support,you must install bt library by vcpkg:./vcpkg.exe install libtorrent
5354

5455
#### Linux
5556
use makefile compile,UBUNTU22.04 x64 or RockyLinux9 x64
56-
Run it on the terminal
57+
Run it on the terminal
58+
if you need bt protocol support,you must install bt library:sudo apt install libtorrent-rasterbar-dev -y
5759

5860
#### Macos
5961
use makefile compile,mac 13 and above
60-
Run it on the terminal
62+
Run it on the terminal
63+
if you need bt protocol support,you must install bt library:brew install libtorrent-rasterbar
6164

6265
##### complie
6366
execute command in XEngine_Source path

‎README.md

+7-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ c c++ file storage service
2424
8. 支持传输速率控制
2525
9. 支持任务开始结束代理转发
2626
10. 支持P2P
27-
11. BT(规划中)
27+
11. BT协议
2828
12. 数据分发
2929
13. 支持秒传和断点续传
3030
14. 支持上传和下载重定向
@@ -48,15 +48,18 @@ macos执行:./XEngine_LINEnv.sh -i 3
4848

4949
#### Windows
5050
使用VS打开并且编译,支持WINDOWS 7SP1以上系统
51-
直接运行即可,使用XEngine_AuthorizeApp
51+
直接运行即可,使用XEngine_AuthorizeApp
52+
如果需要bt协议支持,需要通过vcpkg安装bt支持库:./vcpkg.exe install libtorrent
5253

5354
#### Linux
5455
Linux使用Makefile编译,UBUNTU22.04 x64或者RockyLinux x64
55-
在控制台运行
56+
在控制台运行
57+
如果需要bt协议支持,需要安装bt库,比如,在ubuntu下面安装:sudo apt install libtorrent-rasterbar-dev -y
5658

5759
#### Macos
5860
使用makefile编译,控制台运行,需要mac 13以及以上版本
59-
在控制台运行
61+
在控制台运行
62+
如果需要bt协议支持,需要安装bt库,通过brew安装:brew install libtorrent-rasterbar
6063

6164
##### 编译命令
6265
在XEngine_Source目录下执行命令

‎SECURITY.md

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
Use this section to tell people about which versions of your project are
6+
currently being supported with security updates.
7+
8+
| Version | Supported |
9+
| ------- | ------------------ |
10+
| 2.6.x | :white_check_mark: |
11+
| < 2.6 | :x: |
12+
13+
## Reporting a Vulnerability
14+
15+
Use this section to tell people how to report a vulnerability.
16+
17+
Tell them where to go, how often they can expect to get an update on a
18+
reported vulnerability, what to expect if the vulnerability is accepted or
19+
declined, etc.

0 commit comments

Comments
 (0)