Skip to content

Commit

Permalink
Merge pull request #35 from libxengine/develop
Browse files Browse the repository at this point in the history
V3.14.0.1001 Merge
  • Loading branch information
xengine-qyt authored Apr 18, 2024
2 parents 2bb43d2 + 1839676 commit 470ace1
Show file tree
Hide file tree
Showing 64 changed files with 4,361 additions and 75 deletions.
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
22 changes: 22 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
XEngine_Storage V3.14.0.1001

增加:默认SSL的KEY文件
增加:BT协议模块(支持解析,创建和下载BT种子)
增加:信息报告模块,可以上报信息和查询
修改:定义http请求的类型修改为const char *类型
修改:ssl类型现在采取默认tls了
修改:ssl支持多类型证书了
修改:配置文件逻辑型从int都改成bool了
修正:读取ssl配置不正确的问题
删除:没有使用的center相关代码

added:default ssl key
added:bt protocol module
added:info report module
modify:define http request type modify to const char *
modify:ssl type default only tls now
modify:ssl support multi type cert
modify:boolean type to asbool from asint for configure
fixed:read ssl configure is incorrect
delete:unused code for center
======================================================================================
XEngine_Storage V3.13.0.1001

增加:st_PermissionFlags增加新的标志位上传限制,现在上传文件也可以进行限制了
Expand Down
128 changes: 128 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
486179@qq.com.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series
of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
the community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
11 changes: 7 additions & 4 deletions README.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ feature list:
8. supprot speeds contral
9. supprot task start and end proxy forwarding
10. support p2p
11. bt(planning)
11. bt protocol
12. data distributed
13. support second pass and Resumable
14. support upload and download Redirect
Expand All @@ -49,15 +49,18 @@ Macos Exection:./XEngine_LINEnv.sh -i 3

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

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

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

##### complie
execute command in XEngine_Source path
Expand Down
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ c c++ file storage service
8. 支持传输速率控制
9. 支持任务开始结束代理转发
10. 支持P2P
11. BT(规划中)
11. BT协议
12. 数据分发
13. 支持秒传和断点续传
14. 支持上传和下载重定向
Expand All @@ -48,15 +48,18 @@ macos执行:./XEngine_LINEnv.sh -i 3

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

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

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

##### 编译命令
在XEngine_Source目录下执行命令
Expand Down
19 changes: 19 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Security Policy

## Supported Versions

Use this section to tell people about which versions of your project are
currently being supported with security updates.

| Version | Supported |
| ------- | ------------------ |
| 2.6.x | :white_check_mark: |
| < 2.6 | :x: |

## Reporting a Vulnerability

Use this section to tell people how to report a vulnerability.

Tell them where to go, how often they can expect to get an update on a
reported vulnerability, what to expect if the vulnerability is accepted or
declined, etc.
Loading

0 comments on commit 470ace1

Please sign in to comment.