diff --git a/docs/README.md b/docs/README.md index f5e924e..5782026 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,48 +1,51 @@ -### Welcome -!> The project has just started, and the documentation is not complete, please help with PR +### 欢迎 +!> 项目刚开始，文档尚不完善，欢迎帮忙PR -### Introduction -ZPan is committed to creating an unlimited speed network disk system, so we use the client to connect directly to cloud storage for design. +### 介绍 +ZPan致力于打造一款不限速的网盘系统，因此我们采用客户端直连云存储的方式进行设计。 -Currently ZPan supports all cloud storage platforms compatible with the S3 protocol. You can choose a platform you are familiar with to drive ZPan. +目前ZPan支持所有兼容S3协议的云存储平台，您可以选用您熟悉的平台来驱动ZPan。 -[Online Live](http://zpan.saltbo.cn)(username：demo，password：demo) +[在线体验](http://zpan.saltbo.cn)(体验账号：demo，密码：demo) -### How It Works +### 他是如何工作的？ -ZPan is essentially a URL signature server + a visual file browser. +ZPan本质上是一个URL签名服务器+可视化的文件浏览器。 -Because we use a direct-link method for uploading and downloading, in order to ensure the security of uploading and downloading, all URLs used by the client to upload and download must be signed by the server. +因为我们采用直链的方式进行上传下载，所以为了保证上传下载的安全性，客户端用来上传下载的URL均需要服务端进行签名。 -Then, in order to conveniently manage the files uploaded by users, we need to develop a visual pseudo file system for file management. +然后为了能给方便的管理用户上传的文件，我们就需要开发一个可视化的伪文件系统来进行文件管理。 - [saltbo/zpan](https://github.com/saltbo/zpan) - [saltbo/zpan-front](https://github.com/saltbo/zpan-front) -### Features -- Not limited by server bandwidth -- Support all cloud storage compatible with S3 protocol -- Support file and folder management -- Support file and folder sharing (accessible without logging in) -- Support document preview and audio and video playback -- Support multi-user storage space control -- Support multiple languages +### 特色 +- 完全不受服务器带宽限制 +- 支持所有兼容S3协议的云存储 +- 支持文件及文件夹管理 +- 支持文件及文件夹分享（未登录可访问） +- 支持文档预览及音视频播放 +- 支持多用户存储空间控制 +- 支持多语言 -### Why Not ...? +### 为什么不是...？ #### NextCloud -NextCloud is a very easy to use network disk system. It can be said to be the predecessor in this field. But because it was born relatively early, it was designed base on the local file system. The speed of file transfer is limited by the speed of local network. This means that if you use NextCloud to build a network disk on a server with a bandwidth of one megabyte, the upper bound of the upload and download speed of the network disk is only one megabyte. If you want to increase the speed, you can only upgrade the bandwidth of the server, which is a big cost. +NextCloud是非常好用的网盘系统，可以说是这个领域的前辈了。但是由于它诞生的比较早，在设计上它是基于本地文件系统进行存储的。这就意味着如果您使用NextCloud在一台一兆带宽的服务器上搭建一个网盘，那么网盘的上传下载速度上限就只有一兆，如果您想提升速度就只能给服务器升级带宽，这将是很大的成本。 + +当然，有人可能会说NextCloud也可以用云存储啊。但其实它是通过将云存储挂载成本地磁盘的方式进行使用的，还是无法解决上传下载速度受限于服务器带宽的问题。 #### Cloudreve -Cloudreve is the only product I found before developing ZPan that meets my needs (uploads and downloads are not limited by bandwidth). However, Cloudreve was developed based on PHP at the time, and I was a bit disgusted about that it was troublesome to deploy, so I wanted to implement one by myself in Golang. However, due to some reasons, it was put on hold for more than a year. When I restarted ZPan and it was almost finished, I realized that Cloudreve also used Golang for refactoring during this year. +Cloudreve是我在研发ZPan之前找到的唯一满足我需求（上传下载不受带宽限制）的产品。但是当时Cloudreve是基于PHP开发的，我有点嫌弃它部署起来比较麻烦，所以就想着用Golang自己实现一个。但是由于一些原因，中途搁置了一年多，当我重新开始搞ZPan且已经差不多搞完的时候才发现在这一年中Cloudreve也使用Golang进行重构了。 -It is undeniable that Cloudreve has more functions than ZPan does. ZPan will be more restrained in features, as I always believe that more features are not always better. So, if you find that ZPan does not meet your needs, you can also try Cloudreve. +不可否认Cloudreve在功能上是比ZPan更加多的，ZPan在功能上会比较克制，因为我始终认为功能不是越多越好。所以如果您发现ZPan不满足您的需求，也可以去试试Cloudreve。 -#### EyeblueTank +#### 蓝眼云盘 -Blue Eye Cloud Disk was also found when I was looking for online storage products in the early days. Generally speaking, it fits my vision and is simple and easy to use. Unfortunately, it also belongs to the traditional network disk. I have communicated with his developers, and they have no plans to support cloud storage. +蓝眼云盘也是我早期在找网盘产品的时候找到的，总体来说他符合我的设想，简单好用。但很遗憾，他也属于传统网盘，我和他的开发者有过交流，他们并没有打算支持云存储。 #### Z-File -Z-File is an online file catalog program that supports various object storage and local storage. Its target is to be a commonly used tools by individuals for downloading, or a public file library. It will not be developed in the direction of multiple accounts. +Z-File是一个在线文件目录的程序, 支持各种对象存储和本地存储, 使用定位是个人放常用工具下载, 或做公共的文件库. 不会向多账户方向开发. + diff --git a/docs/_navbar.md b/docs/_navbar.md index 3611427..0050ce9 100644 --- a/docs/_navbar.md +++ b/docs/_navbar.md @@ -1,2 +1,2 @@ -* [English](/) -* [中文](/zh-cn/) \ No newline at end of file +* [中文](/) +* [English](/en/) \ No newline at end of file diff --git a/docs/_sidebar.md b/docs/_sidebar.md index 738bcc2..103dd32 100644 --- a/docs/_sidebar.md +++ b/docs/_sidebar.md @@ -1,7 +1,7 @@ -* [Introduction](/) -* [Getting Started](/getting-started.md) -* [Config](/config.md) -* [Cloud Storage](/cloud-platform.md) -* [Contributing](/contributing.md) -* [Vernacular](/vernacular.md) -* [FAQ](/faq.md) \ No newline at end of file +* [介绍](/) +* [快速开始](/getting-started.md) +* [配置文件](/config.md) +* [云存储](/cloud-platform.md) +* [贡献代码](/contributing.md) +* [白话文教程](/vernacular.md) +* [常见问题](/faq.md) \ No newline at end of file diff --git a/docs/cloud-platform.md b/docs/cloud-platform.md index 61ca749..b8a1c2e 100644 --- a/docs/cloud-platform.md +++ b/docs/cloud-platform.md @@ -1,46 +1,75 @@ -> Here we provide different endpoint samples for each major platform, you need to change `my-zpan-bucket` to your own bucket name +## S3协议平台 -## Endpoint +- 阿里云OSS +- 腾讯云COS +- 七牛云Kodo +- UCloud（需手动自动设置CORS） +- 华为云OBS +- 网易云NOS（需手动自动设置CORS） +- 亚马逊S3 +- MinIO -- AmazonS3：`s3.ap-northeast-1.amazonaws.com` -- TencentCOS：`cos.ap-shanghai.myqcloud.com` -- AliyunOSS：`oss-cn-zhangjiakou.aliyuncs.com` -- QiniuKodo：`s3-cn-east-1.qiniucs.com` -- GoogleStorage：`storage.googleapis.com` +> 路径：管理后台-存储管理-创建存储 -## CORS +### 基础配置 + +image-20210712165603221 + +1. 网盘和外链盘的区别是：外链盘可以直接拿到永久外链，同时它没有分享和回收站的功能 +2. 名称是在zpan中该存储的名字，同时也是路由地址，所以只支持英文 +3. 云平台的数据来源于 https://github.com/eplist/eplist ，欢迎PR +4. 接入点的数据同样源于eplist，选择一个云平台后会自动给出该平台的所有Endpoint + +### 高级配置 + +![image-20210712170751044](https://static.saltbo.cn/images/image-20210712170751044.png) + +1. 高级配置默认都可为空 +2. 标题可以是中文，用于在页面顶部的导航栏显示 +3. 自有域名即用来访问/下载资源的域名 +4. 存储根路径指的是在云存储里的存储路径，默认是根目录，指定一个前缀，可以实现共用一个bucket的场景 +5. 文件存储路径指的是上传的文件在云存储里的存储路径，默认是$NOW_DATE/$RAND_16KEY.$RAW_EXT +6. 可以看到我们支持一些系统变量，通过这些变量你可以设置自己的路径规则 + +### CORS配置 - Origin: http://your-domain - AllowMethods: PUT - AllowHeaders: content-type,content-disposition,x-amz-acl -### S3 -The permissions of s3 are more complicated, and I have not conducted detailed tests. At present, I directly turn off the option of `Block public access to buckets and objects granted through new access control lists (ACLs)`; then configure the following CORS Just fill in and save. -```json -[ - { - "AllowedOrigins": [ - "http://your-domain" - ], - "AllowedMethods": [ - "PUT" - ], - "AllowedHeaders": [ - "content-type", - "content-disposition", - "x-amz-acl" - ], - "ExposeHeaders": [] - } -] -``` - -### Storage -Since Google Cloud Storage does not provide a visual configuration interface, only a command line tool, so we can use CloudShell to operate, the specific commands are as follows: -```bash -echo '[{"origin":["*"],"method":["PUT"],"responseHeader":["content-type","content-disposition","x-amz-acl"]}]' > cors.json -gsutil cors set cors.json gs://your-bucket-name -``` - -### Others -OSS, COS, Kodo and other visualizations are all very good, so don’t talk nonsense, if you really don’t know how to do it, you can watch [Vernacular](/vernacular) \ No newline at end of file + + +## MinIO + +基于MinIO可以快速搭建自己的私有云。 + +需要注意的是，我们仅支持Virtual Hosted-Style模式的S3协议，所以在MinIO搭建时需要注意开启Virtual Hosted-Style。 + +启用的方式很简单，即设置环境变量MINIO_DOMAIN=endpoint.example.com + +当您创建一个bucket名叫zpan时，它的完整域名是zpan.endpoint.example.com + +但是，注意，**zpan中需要您填写的接入点是不包含bucket的，所以您应该填写endpoint.example.com** + + + +#### 参考文档： + +- https://docs.min.io/docs/minio-server-configuration-guide.html +- https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAPI.html + + + + + +## 又拍云 + +!> 又拍云不兼容s3协议，所以和其他平台有一些区别，需要特别注意 + +1. Endpoint填写又拍云默认分配的加速域名（仅供测试那个） +2. AccessKey为操作员名称，AccessSecret为操作员密码 +3. **如果是网盘类型，需要将Token防盗链的秘钥设置为操作员的密码** + +![image-20210712172027775](https://static.saltbo.cn/images/image-20210712172027775.png)![image-20210712172346760](https://static.saltbo.cn/images/image-20210712172346760.png) + +![image-20210712172707803](https://static.saltbo.cn/images/image-20210712172707803.png) \ No newline at end of file diff --git a/docs/config.md b/docs/config.md index d659848..75b5a1f 100644 --- a/docs/config.md +++ b/docs/config.md @@ -1,68 +1,20 @@ -# debug -Whether to output the debug log, the default is false +# 配置文件 -# invitation -Whether invitation registration is enabled, after enabling, only invitation registration is allowed, and it is disabled by default +从v1.5.0版本开始，我们启用了可视化的安装流程，初次安装完成后会生成config.yml的配置文件。如果您需要修改端口或者数据库配置，可以打开该文件进行编辑修改。 -# storage -The initial space allocated to each user, default 50 megabytes, unit: byte +## port +Http端口，默认为8222 -# server -Configure the server -```yaml -server: - port: 8222 - sslport: 443 - domain: - - example1.com - - example2.com -``` - -### port -Http port - -### sslport -Https port, only support 443 at the moment - -### domain -Domain list of the server - -# tls -Configure the tls -```yaml -tls: - enabled: true - auto: true - cacheDir: /opt/ - certPath: "/etc/domain/cert.pem" - certkeyPath: "/etc/domain/cert.key" -``` - -### enable -Whether to enable https - -### auto -Whether to auto https using let's encrypt - -### cacheDir -Let's encrypt cert cache dir, need write permission - -### certPath -Manually set cert - -### certkeyPath -Manually set certkey - -# database -The database driver of ZPan is defined here +## database +这里定义了ZPan的数据库驱动 ```yaml database: driver: sqlite3 dsn: zpan.db ``` -### driver -We support four database drivers, you can choose according to your needs +### driver +我们支持四种数据库驱动，您可以根据需求进行选择 - sqlite3 - mysql @@ -70,65 +22,11 @@ We support four database drivers, you can choose according to your needs - mssql ### dsn -The dsn corresponding to different drivers is also different, here we give the dsn format of each driver separately +不用的驱动对应的dsn也是不一样的，这里我们分别给出每种驱动的dsn格式 | driver | dsn | | ---- | ---- | | sqlite3 | zpan.db | | mysql | user:pass@tcp(127.0.0.1:3306)/zpan?charset=utf8mb4&parseTime=True&loc=Local | | postgres | user=zpan password=zpan dbname=zpan port=9920 sslmode=disable TimeZone=Asia/Shanghai | -| mssql | sqlserver://zpan:LoremIpsum86@localhost:9930?database=zpan | - -# provider -Currently we support all S3-based cloud storage platforms, such as Alibaba Cloud OSS, Tencent Cloud COS, Qiniu Cloud KODO. -```yaml -provider: - name: s3 - bucket: saltbo-zpan-test - endpoint: https://oss-cn-zhangjiakou.aliyuncs.com - accessKey: LTAIxxxxxxxxxxxxxxx7YoV - accessSecret: PFGVwxxxxxxxxxxxxxxxxRd09u -``` - -### name -The name of the cloud storage you use, the options are as follows -- s3(default) -- od(Not currently supported) -- gd(Not currently supported) - -### bucket -The name of the storage space you created - -### endpoint -Access point for cloud storage - -### customHost -Custom domain name bound to cloud storage - -### accessKey -Access key requested from cloud storage - -### accessSecret -Access secret requested from cloud storage - -# email -Configure the email address to open the account registration email verification -```yaml -email: - host: smtpdm.aliyun.com:25 - sender: no-reply@saltbo.fun - username: Zpan - password: mGxxxxxxxxxxh9 -``` - -### host -Mailing service address，eg:: smtpdm.aliyun.com:25 - -### sender: -Mailing address，eg:no-reply@saltbo.fun - -### username -Sender，eg：Zpan - -### password -Sending password \ No newline at end of file +| mssql | sqlserver://zpan:LoremIpsum86@localhost:9930?database=zpan | \ No newline at end of file diff --git a/docs/contributing.md b/docs/contributing.md index d688b81..4e7b176 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -1,53 +1,48 @@ -### Contributing +### 贡献代码 -By participating to this project, you agree to abide our [code of conduct](/CODEOFCONDUCT.md). +!> 参与该项目，即表示您同意遵守我们的[行为准则](/CODEOFCONDUCT.md)。 -#### Setup your machine +### 安装环境 -`zpan` is written in [Go](https://golang.org/). +`zpan` 基于[Go](https://golang.org/)进行开发. -Prerequisites: +依赖: - `make` -- [Go 1.13+](https://golang.org/doc/install) +- [Go 1.16+](https://golang.org/doc/install) -Clone `zpan` anywhere: +克隆源码: ```sh $ git clone git@github.com:saltbo/zpan.git ``` -Install the build and lint dependencies: +安装构建依赖: ```sh $ make dep ``` -A good way of making sure everything is all right is running the test suite: +运行单元测试 ```sh $ make test ``` -### Test your change +### 测试你的修改 -You can create a branch for your changes and try to build from the source as you go: +您可以为更改创建分支，并尝试从源代码进行构建: ```sh $ make build ``` -Which runs all the linters and tests. +### 创建一个提交 -#### Create a commit +提交消息的格式应正确，并使其“标准化”，我们正在使用常规提交。 -Commit messages should be well formatted, and to make that "standardized", we -are using Conventional Commits. - -You can follow the documentation on +您可以按照以下文档操作 [their website](https://www.conventionalcommits.org). -#### Submit a pull request - -Push your branch to your `zpan` fork and open a pull request against the -master branch. \ No newline at end of file +### 提交一个Pull Request +将分支推到您的`zpan`分支，然后对主分支打开一个拉取请求。 \ No newline at end of file diff --git a/docs/en/README.md b/docs/en/README.md new file mode 100644 index 0000000..f5e924e --- /dev/null +++ b/docs/en/README.md @@ -0,0 +1,48 @@ +### Welcome +!> The project has just started, and the documentation is not complete, please help with PR + +### Introduction +ZPan is committed to creating an unlimited speed network disk system, so we use the client to connect directly to cloud storage for design. + +Currently ZPan supports all cloud storage platforms compatible with the S3 protocol. You can choose a platform you are familiar with to drive ZPan. + +[Online Live](http://zpan.saltbo.cn)(username：demo，password：demo) + +### How It Works + +ZPan is essentially a URL signature server + a visual file browser. + +Because we use a direct-link method for uploading and downloading, in order to ensure the security of uploading and downloading, all URLs used by the client to upload and download must be signed by the server. + +Then, in order to conveniently manage the files uploaded by users, we need to develop a visual pseudo file system for file management. + +- [saltbo/zpan](https://github.com/saltbo/zpan) +- [saltbo/zpan-front](https://github.com/saltbo/zpan-front) + +### Features +- Not limited by server bandwidth +- Support all cloud storage compatible with S3 protocol +- Support file and folder management +- Support file and folder sharing (accessible without logging in) +- Support document preview and audio and video playback +- Support multi-user storage space control +- Support multiple languages + +### Why Not ...? + +#### NextCloud +NextCloud is a very easy to use network disk system. It can be said to be the predecessor in this field. But because it was born relatively early, it was designed base on the local file system. The speed of file transfer is limited by the speed of local network. This means that if you use NextCloud to build a network disk on a server with a bandwidth of one megabyte, the upper bound of the upload and download speed of the network disk is only one megabyte. If you want to increase the speed, you can only upgrade the bandwidth of the server, which is a big cost. + +#### Cloudreve + +Cloudreve is the only product I found before developing ZPan that meets my needs (uploads and downloads are not limited by bandwidth). However, Cloudreve was developed based on PHP at the time, and I was a bit disgusted about that it was troublesome to deploy, so I wanted to implement one by myself in Golang. However, due to some reasons, it was put on hold for more than a year. When I restarted ZPan and it was almost finished, I realized that Cloudreve also used Golang for refactoring during this year. + +It is undeniable that Cloudreve has more functions than ZPan does. ZPan will be more restrained in features, as I always believe that more features are not always better. So, if you find that ZPan does not meet your needs, you can also try Cloudreve. + +#### EyeblueTank + +Blue Eye Cloud Disk was also found when I was looking for online storage products in the early days. Generally speaking, it fits my vision and is simple and easy to use. Unfortunately, it also belongs to the traditional network disk. I have communicated with his developers, and they have no plans to support cloud storage. + +#### Z-File + +Z-File is an online file catalog program that supports various object storage and local storage. Its target is to be a commonly used tools by individuals for downloading, or a public file library. It will not be developed in the direction of multiple accounts. diff --git a/docs/en/_sidebar.md b/docs/en/_sidebar.md new file mode 100644 index 0000000..6337874 --- /dev/null +++ b/docs/en/_sidebar.md @@ -0,0 +1,7 @@ +* [Introduction](/en/) +* [Getting Started](/en/getting-started.md) +* [Config](/en/config.md) +* [Cloud Storage](/en/cloud-platform.md) +* [Contributing](/en/contributing.md) +* [Vernacular](/en/vernacular.md) +* [FAQ](/en/faq.md) \ No newline at end of file diff --git a/docs/en/cloud-platform.md b/docs/en/cloud-platform.md new file mode 100644 index 0000000..61ca749 --- /dev/null +++ b/docs/en/cloud-platform.md @@ -0,0 +1,46 @@ +> Here we provide different endpoint samples for each major platform, you need to change `my-zpan-bucket` to your own bucket name + +## Endpoint + +- AmazonS3：`s3.ap-northeast-1.amazonaws.com` +- TencentCOS：`cos.ap-shanghai.myqcloud.com` +- AliyunOSS：`oss-cn-zhangjiakou.aliyuncs.com` +- QiniuKodo：`s3-cn-east-1.qiniucs.com` +- GoogleStorage：`storage.googleapis.com` + +## CORS + +- Origin: http://your-domain +- AllowMethods: PUT +- AllowHeaders: content-type,content-disposition,x-amz-acl + +### S3 +The permissions of s3 are more complicated, and I have not conducted detailed tests. At present, I directly turn off the option of `Block public access to buckets and objects granted through new access control lists (ACLs)`; then configure the following CORS Just fill in and save. +```json +[ + { + "AllowedOrigins": [ + "http://your-domain" + ], + "AllowedMethods": [ + "PUT" + ], + "AllowedHeaders": [ + "content-type", + "content-disposition", + "x-amz-acl" + ], + "ExposeHeaders": [] + } +] +``` + +### Storage +Since Google Cloud Storage does not provide a visual configuration interface, only a command line tool, so we can use CloudShell to operate, the specific commands are as follows: +```bash +echo '[{"origin":["*"],"method":["PUT"],"responseHeader":["content-type","content-disposition","x-amz-acl"]}]' > cors.json +gsutil cors set cors.json gs://your-bucket-name +``` + +### Others +OSS, COS, Kodo and other visualizations are all very good, so don’t talk nonsense, if you really don’t know how to do it, you can watch [Vernacular](/vernacular) \ No newline at end of file diff --git a/docs/en/config.md b/docs/en/config.md new file mode 100644 index 0000000..d659848 --- /dev/null +++ b/docs/en/config.md @@ -0,0 +1,134 @@ +# debug +Whether to output the debug log, the default is false + +# invitation +Whether invitation registration is enabled, after enabling, only invitation registration is allowed, and it is disabled by default + +# storage +The initial space allocated to each user, default 50 megabytes, unit: byte + +# server +Configure the server +```yaml +server: + port: 8222 + sslport: 443 + domain: + - example1.com + - example2.com +``` + +### port +Http port + +### sslport +Https port, only support 443 at the moment + +### domain +Domain list of the server + +# tls +Configure the tls +```yaml +tls: + enabled: true + auto: true + cacheDir: /opt/ + certPath: "/etc/domain/cert.pem" + certkeyPath: "/etc/domain/cert.key" +``` + +### enable +Whether to enable https + +### auto +Whether to auto https using let's encrypt + +### cacheDir +Let's encrypt cert cache dir, need write permission + +### certPath +Manually set cert + +### certkeyPath +Manually set certkey + +# database +The database driver of ZPan is defined here +```yaml +database: + driver: sqlite3 + dsn: zpan.db +``` + +### driver +We support four database drivers, you can choose according to your needs + +- sqlite3 +- mysql +- postgres +- mssql + +### dsn +The dsn corresponding to different drivers is also different, here we give the dsn format of each driver separately + +| driver | dsn | +| ---- | ---- | +| sqlite3 | zpan.db | +| mysql | user:pass@tcp(127.0.0.1:3306)/zpan?charset=utf8mb4&parseTime=True&loc=Local | +| postgres | user=zpan password=zpan dbname=zpan port=9920 sslmode=disable TimeZone=Asia/Shanghai | +| mssql | sqlserver://zpan:LoremIpsum86@localhost:9930?database=zpan | + +# provider +Currently we support all S3-based cloud storage platforms, such as Alibaba Cloud OSS, Tencent Cloud COS, Qiniu Cloud KODO. +```yaml +provider: + name: s3 + bucket: saltbo-zpan-test + endpoint: https://oss-cn-zhangjiakou.aliyuncs.com + accessKey: LTAIxxxxxxxxxxxxxxx7YoV + accessSecret: PFGVwxxxxxxxxxxxxxxxxRd09u +``` + +### name +The name of the cloud storage you use, the options are as follows +- s3(default) +- od(Not currently supported) +- gd(Not currently supported) + +### bucket +The name of the storage space you created + +### endpoint +Access point for cloud storage + +### customHost +Custom domain name bound to cloud storage + +### accessKey +Access key requested from cloud storage + +### accessSecret +Access secret requested from cloud storage + +# email +Configure the email address to open the account registration email verification +```yaml +email: + host: smtpdm.aliyun.com:25 + sender: no-reply@saltbo.fun + username: Zpan + password: mGxxxxxxxxxxh9 +``` + +### host +Mailing service address，eg:: smtpdm.aliyun.com:25 + +### sender: +Mailing address，eg:no-reply@saltbo.fun + +### username +Sender，eg：Zpan + +### password +Sending password \ No newline at end of file diff --git a/docs/en/contributing.md b/docs/en/contributing.md new file mode 100644 index 0000000..d688b81 --- /dev/null +++ b/docs/en/contributing.md @@ -0,0 +1,53 @@ +### Contributing + +By participating to this project, you agree to abide our [code of conduct](/CODEOFCONDUCT.md). + +#### Setup your machine + +`zpan` is written in [Go](https://golang.org/). + +Prerequisites: + +- `make` +- [Go 1.13+](https://golang.org/doc/install) + +Clone `zpan` anywhere: + +```sh +$ git clone git@github.com:saltbo/zpan.git +``` + +Install the build and lint dependencies: + +```sh +$ make dep +``` + +A good way of making sure everything is all right is running the test suite: + +```sh +$ make test +``` + +### Test your change + +You can create a branch for your changes and try to build from the source as you go: + +```sh +$ make build +``` + +Which runs all the linters and tests. + +#### Create a commit + +Commit messages should be well formatted, and to make that "standardized", we +are using Conventional Commits. + +You can follow the documentation on +[their website](https://www.conventionalcommits.org). + +#### Submit a pull request + +Push your branch to your `zpan` fork and open a pull request against the +master branch. \ No newline at end of file diff --git a/docs/en/faq.md b/docs/en/faq.md new file mode 100644 index 0000000..bb3114b --- /dev/null +++ b/docs/en/faq.md @@ -0,0 +1,15 @@ +### FAQ + +To be collected + +### Feedback +If the problem you encounter is not within the above range, please create an [issue](https://github.com/saltbo/zpan/issues) on GitHub for feedback. + +If you find any defects in the process of use, or have a new demand proposal, you are also welcome to submit an [issue](https://github.com/saltbo/zpan/issues). + +### Contact +- [Telegram](https://t.me/zzpan) + +Or contact the developer: + +Email：saltbo@foxmail.com \ No newline at end of file diff --git a/docs/zh-cn/getting-started.md b/docs/en/getting-started.md similarity index 56% rename from docs/zh-cn/getting-started.md rename to docs/en/getting-started.md index ce41a74..5510382 100644 --- a/docs/zh-cn/getting-started.md +++ b/docs/en/getting-started.md @@ -1,15 +1,15 @@ ## Linux ```bash -# 安装服务 +# install service curl -sSf https://dl.saltbo.cn/install.sh | sh -s zpan -# 启动服务 +# start service systemctl start zpan -# 查看服务状态 +# check service status systemctl status zpan -# 设置开机启动 +# set boot up systemctl enable zpan ``` @@ -20,13 +20,11 @@ docker run -it -p 8222:8222 -v /etc/zpan:/etc/zpan --name zpan saltbo/zpan ## CORS -!> 由于我们采用浏览器端直传，所以存在跨域问题，请进行如下跨域配置 +!> Since we use browser-side direct transmission, there are cross-domain issues, please make the following cross-domain configuration - Origin: http://your-domain - AllowMethods: PUT - AllowHeaders: content-type,content-disposition,x-amz-acl ### Usage ->管理员默认账号密码会输出到Stdout，请到启动日志里获取并记录 - -visit http://localhost:8222 \ No newline at end of file +visit http://localhost:8222 diff --git a/docs/en/vernacular.md b/docs/en/vernacular.md new file mode 100644 index 0000000..bfe8831 --- /dev/null +++ b/docs/en/vernacular.md @@ -0,0 +1,7 @@ +### Vernacular Course + +- How to run ZPan based on Alibaba Cloud OSS（Recruiting） +- How to run ZPan based on Qiniu Kodo（Recruiting） +- How to run ZPan based on Tencent COS（Recruiting） +- How to run ZPan based on Amazon S3（Recruiting） +- How to run ZPan based on Google Cloud Storage（Recruiting） \ No newline at end of file diff --git a/docs/faq.md b/docs/faq.md index bb3114b..3555e24 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -1,15 +1,38 @@ -### FAQ +# 常见问题 -To be collected +**一、Network Error是什么原因？** -### Feedback -If the problem you encounter is not within the above range, please create an [issue](https://github.com/saltbo/zpan/issues) on GitHub for feedback. +答：如果您的网络状况正常，那么可能是没有进行跨域设置。请检查您使用的云平台是否需要手动设置跨域 -If you find any defects in the process of use, or have a new demand proposal, you are also welcome to submit an [issue](https://github.com/saltbo/zpan/issues). +**二、Docker安装之后如何修改配置文件？** -### Contact -- [Telegram](https://t.me/zzpan) +答：可以把docker里的默认配置文件复制到宿主机上，在宿主机上修改调整之后再挂载到docker里。下面的命令供参考 -Or contact the developer: +```bash +docker run -it zpan cat /etc/zpan/zpan.yml > /etc/zpan/zpan.yml +vi /etc/zpan/zpan.yml +docker run -it -v /etc/zpan:/etc/zpan zpan +``` -Email：saltbo@foxmail.com \ No newline at end of file +**三、为什么接入点不支持ip+端口** + +答：因为我们仅支持virtual-host-style，系统会自动把bucket名称拼接到接入点上，如果使用ip拼上去就错了。详见https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAPI.html + +**四、为什么不支持Windows系统？** + +答：实际上Mac也没有提供二进制包，主要是考虑ZPan是一个服务端程序，再加上ZPan用到的一些依赖在支持多平台的情况下打包遇到一些麻烦，所以目前仅提供了一个Linux版本的Release，后续我们会考虑支持多平台。 + +## 用户反馈 +如果您遇到的问题不再以上范围内，请到GitHub上创建一个[issue](https://github.com/saltbo/zpan/issue)进行反馈。 + +如果您在使用过程中发现了什么缺陷，或是有新的需求提议，也欢迎提交[issue](https://github.com/saltbo/zpan/issue)。 + +## 联系 + +- Telegram: https://t.me/zpanchannel +- 邮箱：saltbo@foxmail.com +- 微信：saltbo + +image-20201110234507523 + +扫码备注ZPan进入微信群，和我一起完善这个产品。 diff --git a/docs/getting-started.md b/docs/getting-started.md index 5510382..8dc1b10 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -1,30 +1,28 @@ -## Linux +## Install + +### Linux ```bash -# install service +# 安装服务 curl -sSf https://dl.saltbo.cn/install.sh | sh -s zpan -# start service +# 启动服务 systemctl start zpan -# check service status +# 查看服务状态 systemctl status zpan -# set boot up +# 设置开机启动 systemctl enable zpan + +# 查看日志 +journalctl -xe -u zpan -f ``` -## Docker +### Docker ```bash docker run -it -p 8222:8222 -v /etc/zpan:/etc/zpan --name zpan saltbo/zpan ``` -## CORS - -!> Since we use browser-side direct transmission, there are cross-domain issues, please make the following cross-domain configuration - -- Origin: http://your-domain -- AllowMethods: PUT -- AllowHeaders: content-type,content-disposition,x-amz-acl +## Usage -### Usage -visit http://localhost:8222 +visit http://localhost:8222 \ No newline at end of file diff --git a/docs/vernacular.md b/docs/vernacular.md index bfe8831..26d714f 100644 --- a/docs/vernacular.md +++ b/docs/vernacular.md @@ -1,7 +1,8 @@ -### Vernacular Course +### 白话文教程 -- How to run ZPan based on Alibaba Cloud OSS（Recruiting） -- How to run ZPan based on Qiniu Kodo（Recruiting） -- How to run ZPan based on Tencent COS（Recruiting） -- How to run ZPan based on Amazon S3（Recruiting） -- How to run ZPan based on Google Cloud Storage（Recruiting） \ No newline at end of file +- [自建网盘解决方案-基于云存储的网盘系统zpan](https://ov-vo.org/987) +- 如何基于阿里云OSS搭建ZPan（招募中） +- 如何基于七牛Kodo搭建ZPan（招募中） +- 如何基于腾讯COS搭建ZPan（招募中） +- 如何基于亚马逊S3搭建ZPan（招募中） +- 如何基于谷歌云Storage搭建ZPan（招募中） \ No newline at end of file diff --git a/docs/zh-cn/README.md b/docs/zh-cn/README.md deleted file mode 100644 index 5782026..0000000 --- a/docs/zh-cn/README.md +++ /dev/null @@ -1,51 +0,0 @@ -### 欢迎 -!> 项目刚开始，文档尚不完善，欢迎帮忙PR - -### 介绍 -ZPan致力于打造一款不限速的网盘系统，因此我们采用客户端直连云存储的方式进行设计。 - -目前ZPan支持所有兼容S3协议的云存储平台，您可以选用您熟悉的平台来驱动ZPan。 - -[在线体验](http://zpan.saltbo.cn)(体验账号：demo，密码：demo) - -### 他是如何工作的？ - -ZPan本质上是一个URL签名服务器+可视化的文件浏览器。 - -因为我们采用直链的方式进行上传下载，所以为了保证上传下载的安全性，客户端用来上传下载的URL均需要服务端进行签名。 - -然后为了能给方便的管理用户上传的文件，我们就需要开发一个可视化的伪文件系统来进行文件管理。 - -- [saltbo/zpan](https://github.com/saltbo/zpan) -- [saltbo/zpan-front](https://github.com/saltbo/zpan-front) - -### 特色 -- 完全不受服务器带宽限制 -- 支持所有兼容S3协议的云存储 -- 支持文件及文件夹管理 -- 支持文件及文件夹分享（未登录可访问） -- 支持文档预览及音视频播放 -- 支持多用户存储空间控制 -- 支持多语言 - -### 为什么不是...？ - -#### NextCloud -NextCloud是非常好用的网盘系统，可以说是这个领域的前辈了。但是由于它诞生的比较早，在设计上它是基于本地文件系统进行存储的。这就意味着如果您使用NextCloud在一台一兆带宽的服务器上搭建一个网盘，那么网盘的上传下载速度上限就只有一兆，如果您想提升速度就只能给服务器升级带宽，这将是很大的成本。 - -当然，有人可能会说NextCloud也可以用云存储啊。但其实它是通过将云存储挂载成本地磁盘的方式进行使用的，还是无法解决上传下载速度受限于服务器带宽的问题。 - -#### Cloudreve - -Cloudreve是我在研发ZPan之前找到的唯一满足我需求（上传下载不受带宽限制）的产品。但是当时Cloudreve是基于PHP开发的，我有点嫌弃它部署起来比较麻烦，所以就想着用Golang自己实现一个。但是由于一些原因，中途搁置了一年多，当我重新开始搞ZPan且已经差不多搞完的时候才发现在这一年中Cloudreve也使用Golang进行重构了。 - -不可否认Cloudreve在功能上是比ZPan更加多的，ZPan在功能上会比较克制，因为我始终认为功能不是越多越好。所以如果您发现ZPan不满足您的需求，也可以去试试Cloudreve。 - -#### 蓝眼云盘 - -蓝眼云盘也是我早期在找网盘产品的时候找到的，总体来说他符合我的设想，简单好用。但很遗憾，他也属于传统网盘，我和他的开发者有过交流，他们并没有打算支持云存储。 - -#### Z-File - -Z-File是一个在线文件目录的程序, 支持各种对象存储和本地存储, 使用定位是个人放常用工具下载, 或做公共的文件库. 不会向多账户方向开发. - diff --git a/docs/zh-cn/_sidebar.md b/docs/zh-cn/_sidebar.md deleted file mode 100644 index b5764b5..0000000 --- a/docs/zh-cn/_sidebar.md +++ /dev/null @@ -1,7 +0,0 @@ -* [介绍](/zh-cn/) -* [快速开始](/zh-cn/getting-started.md) -* [配置文件](/zh-cn/config.md) -* [云存储](/zh-cn/cloud-platform.md) -* [贡献代码](/zh-cn/contributing.md) -* [白话文教程](/zh-cn/vernacular.md) -* [常见问题](/zh-cn/faq.md) \ No newline at end of file diff --git a/docs/zh-cn/cloud-platform.md b/docs/zh-cn/cloud-platform.md deleted file mode 100644 index ce0d43b..0000000 --- a/docs/zh-cn/cloud-platform.md +++ /dev/null @@ -1,29 +0,0 @@ -> 这里我们列出了主流云平台的相关配置，仅供参考 - -## Endpoint - -- 亚马逊S3：`s3.ap-northeast-1.amazonaws.com` -- 腾讯云COS：`cos.ap-shanghai.myqcloud.com` -- 阿里云OSS：`oss-cn-zhangjiakou.aliyuncs.com` -- 七牛云Kodo：`s3-cn-east-1.qiniucs.com` -- 谷歌云Storage：`storage.googleapis.com` - -## CORS配置 - -- Origin: http://your-domain -- AllowMethods: PUT -- AllowHeaders: content-type,content-disposition,x-amz-acl - -从v.1.5.0开始，在管理后台添加云存储配置的时候会自动进行CORS的设置。 - -但由于多数厂商兼容的S3协议API里并不包含CORS相关操作，所以CORS的设置每个厂商的情况都不一样。 - -目前支持的平台有： -- 阿里云OSS -- 腾讯云COS -- 七牛云Kodo -- UCloud（暂不支持自动设置CORS） -- 华为云OBS -- 网易云NOS（暂不支持自动设置CORS） -- 亚马逊S3 -- MinIO diff --git a/docs/zh-cn/config.md b/docs/zh-cn/config.md deleted file mode 100644 index d1b4c59..0000000 --- a/docs/zh-cn/config.md +++ /dev/null @@ -1,14 +0,0 @@ -## 配置文件 - -从v1.5.0版本开始，我们启用了可视化的安装流程，初次安装完成后会生成config.yml的配置文件。 - -### port -Http端口，默认为8222 - -### database -这里定义了ZPan的数据库驱动 -```yaml -database: - driver: sqlite3 - dsn: zpan.db -``` \ No newline at end of file diff --git a/docs/zh-cn/contributing.md b/docs/zh-cn/contributing.md deleted file mode 100644 index 4e7b176..0000000 --- a/docs/zh-cn/contributing.md +++ /dev/null @@ -1,48 +0,0 @@ -### 贡献代码 - -!> 参与该项目，即表示您同意遵守我们的[行为准则](/CODEOFCONDUCT.md)。 - -### 安装环境 - -`zpan` 基于[Go](https://golang.org/)进行开发. - -依赖: - -- `make` -- [Go 1.16+](https://golang.org/doc/install) - -克隆源码: - -```sh -$ git clone git@github.com:saltbo/zpan.git -``` - -安装构建依赖: - -```sh -$ make dep -``` - -运行单元测试 - -```sh -$ make test -``` - -### 测试你的修改 - -您可以为更改创建分支，并尝试从源代码进行构建: - -```sh -$ make build -``` - -### 创建一个提交 - -提交消息的格式应正确，并使其“标准化”，我们正在使用常规提交。 - -您可以按照以下文档操作 -[their website](https://www.conventionalcommits.org). - -### 提交一个Pull Request -将分支推到您的`zpan`分支，然后对主分支打开一个拉取请求。 \ No newline at end of file diff --git a/docs/zh-cn/faq.md b/docs/zh-cn/faq.md deleted file mode 100644 index 65095eb..0000000 --- a/docs/zh-cn/faq.md +++ /dev/null @@ -1,32 +0,0 @@ -### 常见问题 - -**一、管理员账号密码是什么？** - -答：因为目前缺少引导安装的流程，所以管理员账号密码是系统随机生成的。具体可以在系统的启动日志中找到，如果是docker启动的，可以使用`docker logs zpan`进行查看。如果是systemd启动的，可以使用`journalctl -u zpan`进行查看。 - -**二、Docker安装之后如果修改配置文件？** -```bash -docker run -it zpan cat /etc/zpan/zpan.yml > /etc/zpan/zpan.yml -vi /etc/zpan/zpan.yml -docker run -it -v /etc/zpan:/etc/zpan zpan -``` -答：可以把docker里的默认配置文件复制到宿主机上，在宿主机上修改调整之后再挂载到docker里。上面的命令仅供参考 - -**三、如何添加新用户** - -答：目前仅支持用户自主注册，管理员添加用户的功能后续会支持，敬请关注~ - -**四、为什么不支持Windows系统？** - -答：实际上Mac也没有提供二进制包，主要是考虑ZPan是一个服务端程序，再加上ZPan用到的一些依赖在支持多平台的情况下打包遇到一些麻烦，所以目前仅提供了一个Linux版本的Release，后续我们会考虑支持多平台。 - -### 用户反馈 -如果您遇到的问题不再以上范围内，请到GitHub上创建一个[issue](https://github.com/saltbo/zpan/issue)进行反馈。 - -如果您在使用过程中发现了什么缺陷，或是有新的需求提议，也欢迎提交[issue](https://github.com/saltbo/zpan/issue)。 - -### 联系 - -image-20201110234507523 - -扫码备注ZPan进入微信群，和我一起完善这个产品。 diff --git a/docs/zh-cn/vernacular.md b/docs/zh-cn/vernacular.md deleted file mode 100644 index 26d714f..0000000 --- a/docs/zh-cn/vernacular.md +++ /dev/null @@ -1,8 +0,0 @@ -### 白话文教程 - -- [自建网盘解决方案-基于云存储的网盘系统zpan](https://ov-vo.org/987) -- 如何基于阿里云OSS搭建ZPan（招募中） -- 如何基于七牛Kodo搭建ZPan（招募中） -- 如何基于腾讯COS搭建ZPan（招募中） -- 如何基于亚马逊S3搭建ZPan（招募中） -- 如何基于谷歌云Storage搭建ZPan（招募中） \ No newline at end of file