From b557256402c72584412b056881f38f39c92d78a6 Mon Sep 17 00:00:00 2001 From: jmal Date: Wed, 27 Jan 2021 16:17:19 +0800 Subject: [PATCH 01/15] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f62b381..1f46db3 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -### DEMO: www.jmal.cloud , 用户名:amdin,密码:123456 +### 线上预览地址: www.jmal.top , 用户名:amdin,密码:jmalcloud 部分截图: -![image](https://raw.githubusercontent.com/jamebal/jmal-cloud-view/master/doc/demo.png) +![image](https://www.jmal.top/api/file/admin/%E6%88%AA%E5%B1%8F%20133.png.webp) # jmal-cloud-view 网盘前端界面 From d0935410b533d76940de7e8b8c5669051cd3e3d9 Mon Sep 17 00:00:00 2001 From: jmal Date: Wed, 27 Jan 2021 16:18:56 +0800 Subject: [PATCH 02/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1f46db3..95fd280 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -### 线上预览地址: www.jmal.top , 用户名:amdin,密码:jmalcloud +### 线上预览地址: https://www.jmal.top , 用户名:amdin,密码:jmalcloud 部分截图: ![image](https://www.jmal.top/api/file/admin/%E6%88%AA%E5%B1%8F%20133.png.webp) From 97e52a193e33672a54a357306ecb834643af6d14 Mon Sep 17 00:00:00 2001 From: jmal Date: Wed, 27 Jan 2021 16:21:26 +0800 Subject: [PATCH 03/15] Update README.md --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 95fd280..5f24c38 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,22 @@ +### web网盘应用 + ### 线上预览地址: https://www.jmal.top , 用户名:amdin,密码:jmalcloud 部分截图: ![image](https://www.jmal.top/api/file/admin/%E6%88%AA%E5%B1%8F%20133.png.webp) -# jmal-cloud-view +### jmal-cloud-view 网盘前端界面 基于 [vue-admin-template](https://github.com/PanJiaChen/vue-admin-template) -## 开始 +### 使用 ### 1.运行nginx服务器，需要安装[mod_zip](https://github.com/evanmiller/mod_zip) 的nginx插件 nginx配置 [nignx.conf](https://github.com/jamebal/jmal-cloud-server/blob/master/src/main/resources/nginx.conf) -### 2.运行web服务器 [jmal-cloud-server](https://github.com/jamebal/jmal-cloud-server) +#### 2.运行web服务器 [jmal-cloud-server](https://github.com/jamebal/jmal-cloud-server) 下载最新的 [clouddisk-x.x.x-exec.jar](https://github.com/jamebal/jmal-cloud-server/releases) From a4363b831ab2845d319fe2c1ebae925020ea3f68 Mon Sep 17 00:00:00 2001 From: jmal Date: Wed, 27 Jan 2021 16:37:03 +0800 Subject: [PATCH 04/15] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f24c38..894d267 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -### web网盘应用 +# JmalCloud 个人网盘 +是一款开源免费的私有云存储网盘项目 ### 线上预览地址: https://www.jmal.top , 用户名:amdin,密码:jmalcloud From ed5c8e84ddcf4bf260d973e6eb5b05198c264c66 Mon Sep 17 00:00:00 2001 From: jmal Date: Wed, 27 Jan 2021 17:22:41 +0800 Subject: [PATCH 05/15] Update README.md --- README.md | 69 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 57 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 894d267..361e8be 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # JmalCloud 个人网盘 -是一款开源免费的私有云存储网盘项目 +JmalCloud 是一款私有云存储网盘项目 ### 线上预览地址: https://www.jmal.top , 用户名:amdin,密码:jmalcloud @@ -11,28 +11,73 @@ 基于 [vue-admin-template](https://github.com/PanJiaChen/vue-admin-template) -### 使用 +### 部署 -### 1.运行nginx服务器，需要安装[mod_zip](https://github.com/evanmiller/mod_zip) 的nginx插件 +#### 1.环境准备 -nginx配置 [nignx.conf](https://github.com/jamebal/jmal-cloud-server/blob/master/src/main/resources/nginx.conf) +- nginx 1.18+ +- mongodb 4.0+ +- jdk 1.8+ -#### 2.运行web服务器 [jmal-cloud-server](https://github.com/jamebal/jmal-cloud-server) +#### 2.下载网盘界面程序，并配置nginx +去[这里](https://github.com/jamebal/jmal-cloud-view/releases)下载最新的版本，选择dist.tar下载 +下载后解压到某个地方 +nginx配置如下: +```nginx +server { + listen 80; + server_name localhost; + # 这里为dist.tar解压后的路径 + root xxx/xxx/xxx/dist; -下载最新的 [clouddisk-x.x.x-exec.jar](https://github.com/jamebal/jmal-cloud-server/releases) + client_body_temp_path /Users/jmal/temp/filetest/rootpath; + client_max_body_size 100m; + client_body_buffer_size 100m; -启动(需要提前安装jdk环境) -```bash -java -jar clouddisk-1.0-exec.jar --file.rrootDir=/home/jmal/file/ -# file.rrootDir表示文件保存的目录 + location /api { + proxy_pass http://localhost:8088/; + proxy_set_header Host $proxy_host; + } + + location / { + try_files $uri $uri/ /index.html; + index index.html index.htm; + } + + location /mq { + proxy_pass http://localhost:8088/mq/; + #websocket额外配置开始 + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_connect_timeout 60s;#l连接超时时间，不能设置太长会浪费连接资源 + proxy_read_timeout 500s;#读超时时间 + proxy_send_timeout 500s;#写超时时间 + #websocket额外配置结束 + } + + location /articles { + proxy_pass http://localhost:8088/articles; + proxy_set_header Host $proxy_host; + } + + location ~ \.(eot|otf|ttf|woff|woff2|svg)$ { + add_header Access-Control-Allow-Origin *; + } +} ``` + +#### 4.下载网盘服务程序 +去[这里](https://github.com/jamebal/jmal-cloud-server/releases)最新的jar包 + +启动(需要提前安装jdk,mongodb环境) +# file.rrootDir表示网盘文件真实的存储的目录 +`java -jar clouddisk-2.0-exec.jar --spring.profiles.active=prod --file.rootDir=/home/jmal/file/` 或者克隆下来自己编译 ```bash git clone https://github.com/jamebal/jmal-cloud-server.git ``` -### 3. 配置前端界面 - #### 开发模式 ```bash git clone https://github.com/jamebal/jmal-cloud-view.git From ea9bb60d9cf90c9b5c93ef1d828b497620615b22 Mon Sep 17 00:00:00 2001 From: jmal Date: Wed, 27 Jan 2021 17:24:20 +0800 Subject: [PATCH 06/15] Update README.md --- README.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 361e8be..97cee2b 100644 --- a/README.md +++ b/README.md @@ -46,14 +46,12 @@ server { location /mq { proxy_pass http://localhost:8088/mq/; - #websocket额外配置开始 - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_connect_timeout 60s;#l连接超时时间，不能设置太长会浪费连接资源 - proxy_read_timeout 500s;#读超时时间 - proxy_send_timeout 500s;#写超时时间 - #websocket额外配置结束 + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_connect_timeout 60s; + proxy_read_timeout 500s; + proxy_send_timeout 500s; } location /articles { From 5c20e6ec70f3b85a1b6d186655b38d9b0488ad20 Mon Sep 17 00:00:00 2001 From: jmal Date: Wed, 27 Jan 2021 17:27:45 +0800 Subject: [PATCH 07/15] Update README.md --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 97cee2b..4beb3c6 100644 --- a/README.md +++ b/README.md @@ -23,12 +23,14 @@ JmalCloud 是一款私有云存储网盘项目 去[这里](https://github.com/jamebal/jmal-cloud-view/releases)下载最新的版本，选择dist.tar下载 下载后解压到某个地方 nginx配置如下: +只需要修改两个地方 ```nginx server { listen 80; - server_name localhost; - # 这里为dist.tar解压后的路径 - root xxx/xxx/xxx/dist; + # 1.这里填写你的ip地址，或域名 + server_name xxx; + # 2.这填写为dist.tar解压后的路径 + root xxx; client_body_temp_path /Users/jmal/temp/filetest/rootpath; client_max_body_size 100m; From f71ee7b63941f8fda86b5d37c5faf5484826b79e Mon Sep 17 00:00:00 2001 From: jmal Date: Wed, 27 Jan 2021 17:28:28 +0800 Subject: [PATCH 08/15] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 4beb3c6..8f509a9 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,11 @@ JmalCloud 是一款私有云存储网盘项目 #### 2.下载网盘界面程序，并配置nginx 去[这里](https://github.com/jamebal/jmal-cloud-view/releases)下载最新的版本，选择dist.tar下载 + 下载后解压到某个地方 + nginx配置如下: + 只需要修改两个地方 ```nginx server { From f2492f295ae27b29a27e86a7b926fca289098648 Mon Sep 17 00:00:00 2001 From: jmal Date: Wed, 27 Jan 2021 17:32:17 +0800 Subject: [PATCH 09/15] Update README.md --- README.md | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 8f509a9..cfa225c 100644 --- a/README.md +++ b/README.md @@ -20,13 +20,13 @@ JmalCloud 是一款私有云存储网盘项目 - jdk 1.8+ #### 2.下载网盘界面程序，并配置nginx + 去[这里](https://github.com/jamebal/jmal-cloud-view/releases)下载最新的版本，选择dist.tar下载 下载后解压到某个地方 -nginx配置如下: +nginx配置如下: （只需要修改两个地方） -只需要修改两个地方 ```nginx server { listen 80; @@ -71,39 +71,19 @@ server { ``` #### 4.下载网盘服务程序 + 去[这里](https://github.com/jamebal/jmal-cloud-server/releases)最新的jar包 启动(需要提前安装jdk,mongodb环境) -# file.rrootDir表示网盘文件真实的存储的目录 -`java -jar clouddisk-2.0-exec.jar --spring.profiles.active=prod --file.rootDir=/home/jmal/file/` -或者克隆下来自己编译 -```bash -git clone https://github.com/jamebal/jmal-cloud-server.git -``` -#### 开发模式 -```bash -git clone https://github.com/jamebal/jmal-cloud-view.git +`java -jar clouddisk-2.0-exec.jar --spring.profiles.active=prod --file.rootDir=xxx` -cd jmal-cloud-view + 其中`file.rrootDir`为网盘文件真实的存储的位置 -npm install +#### 5.访问 +http://你的IP或域名 -npm run dev -``` -然后打开 http://localhost:9528 -#### 或者构建 -```bash -# 为生产环境构建 -npm run build:prod -``` - -将生成的dist目录配置到[nginx](https://github.com/jamebal/jmal-cloud-server/blob/master/src/main/resources/nginx.conf)中 - -也可在[这里](https://github.com/jamebal/jmal-cloud-server/releases)下载最新的 dist目录 - -然后访问 http://localhost 即可 ## 浏览器支持 From 11c98972da1f412c39f085abf8e1f9777ca9f7a4 Mon Sep 17 00:00:00 2001 From: jmal Date: Wed, 27 Jan 2021 17:34:06 +0800 Subject: [PATCH 10/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cfa225c..516740b 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ server { 其中`file.rrootDir`为网盘文件真实的存储的位置 #### 5.访问 -http://你的IP或域名 +在浏览器里直接输入你的IP或域名即可 From 3484bc872e8f18436ba2d4a6c85beeefea6b6103 Mon Sep 17 00:00:00 2001 From: jmal Date: Wed, 27 Jan 2021 17:36:26 +0800 Subject: [PATCH 11/15] Update README.md --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 516740b..4e14a07 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,6 @@ JmalCloud 是一款私有云存储网盘项目 部分截图: ![image](https://www.jmal.top/api/file/admin/%E6%88%AA%E5%B1%8F%20133.png.webp) -### jmal-cloud-view -网盘前端界面 - -基于 [vue-admin-template](https://github.com/PanJiaChen/vue-admin-template) ### 部署 @@ -85,13 +81,17 @@ server { -## 浏览器支持 +### 浏览器支持 | [IE / Edge](http://godban.github.io/browsers-support-badges/)
IE / Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | | --------- | --------- | --------- | --------- | | IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions -## License +### 感谢🙏 + +- 感谢[PanJiaChen]提供的[vue-admin-template](https://github.com/PanJiaChen/vue-admin-template) + +### License [MIT](https://github.com/jamebal/jmal-cloud-view/blob/master/LICENSE) license. From a01ecb26b5e4b6ca326502cbc8353bdcb64d6c4d Mon Sep 17 00:00:00 2001 From: jmal Date: Wed, 27 Jan 2021 17:39:19 +0800 Subject: [PATCH 12/15] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4e14a07..571f17c 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,8 @@ server { ### 感谢🙏 -- 感谢[PanJiaChen]提供的[vue-admin-template](https://github.com/PanJiaChen/vue-admin-template) +- 感谢[PanJiaChen](https://github.com/PanJiaChen)提供的[vue-admin-template](https://github.com/PanJiaChen/vue-admin-template) +- 感谢[Vanessa219](https://github.com/Vanessa219)提供的[Vidtor](https://github.com/Vanessa219/vditor) ### License From f07594e1489f091aeaa4fdd041ea98cec788feba Mon Sep 17 00:00:00 2001 From: jmal Date: Wed, 27 Jan 2021 17:40:53 +0800 Subject: [PATCH 13/15] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 571f17c..c0ed52e 100644 --- a/README.md +++ b/README.md @@ -89,8 +89,8 @@ server { ### 感谢🙏 -- 感谢[PanJiaChen](https://github.com/PanJiaChen)提供的[vue-admin-template](https://github.com/PanJiaChen/vue-admin-template) -- 感谢[Vanessa219](https://github.com/Vanessa219)提供的[Vidtor](https://github.com/Vanessa219/vditor) +- 感谢 PanJiaChen 提供的[vue-admin-template](https://github.com/PanJiaChen/vue-admin-template) +- 感谢 Vanessa219 提供的(https://github.com/Vanessa219)提供的[Vidtor](https://github.com/Vanessa219/vditor) ### License From 3baa4a02f048f417f4b9f75d49d71a70010ff512 Mon Sep 17 00:00:00 2001 From: jmal Date: Wed, 27 Jan 2021 17:45:10 +0800 Subject: [PATCH 14/15] Update README.md --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c0ed52e..54efe40 100644 --- a/README.md +++ b/README.md @@ -87,10 +87,12 @@ server { | --------- | --------- | --------- | --------- | | IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions -### 感谢🙏 +### 后续更新 -- 感谢 PanJiaChen 提供的[vue-admin-template](https://github.com/PanJiaChen/vue-admin-template) -- 感谢 Vanessa219 提供的(https://github.com/Vanessa219)提供的[Vidtor](https://github.com/Vanessa219/vditor) +- [ ] webDAV +- [ ] iOS APP +- [ ] Android APP +- [ ] PC ### License From a2951f6844464f128418842244eef1c1d43c48e5 Mon Sep 17 00:00:00 2001 From: jmal Date: Wed, 27 Jan 2021 17:48:04 +0800 Subject: [PATCH 15/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 54efe40..a7f0040 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ server { - [ ] Android APP - [ ] PC -### License +### 许可 [MIT](https://github.com/jamebal/jmal-cloud-view/blob/master/LICENSE) license.