kuaifan 5 anni fa
parent
commit
962636ee88
7 ha cambiato i file con 288 aggiunte e 163 eliminazioni
  1. 10 10
      README-EN.md
  2. 10 10
      README.md
  3. 27 3
      INSTALL-BT.md
  4. 98 0
      install/DOCKER.md
  5. 23 70
      INSTALL.md
  6. 98 0
      install/en/DOCKER.md
  7. 22 70
      INSTALL-EN.md

+ 10 - 10
README-EN.md

@@ -1,15 +1,15 @@
 # Introduction
 
-**[中文文档](./README.md)**
+**[中文文档](README.md)**
 
 - `wookteam` Is a lightweight online team collaboration tool, provides a variety of documentation tools, online mind mapping, online flow chart, project management, task distribution, knowledge base management tools.
 - `wookteam` Support team online chat communication, subscribe task dynamic real-time push.
 - **`wookteam` All open source.**
 
 ## Installation
-- [Install(Using Docker)](./INSTALL-EN.md#setup-using-docker)
-- [Install(Bt Panel)](./INSTALL-BT.md)
-- [Install(Server)](./INSTALL-EN.md#setup-if-youre-not-using-docker)
+- [Install(Docker)](install/en/DOCKER.md)
+- [Install(Server)](install/en/SERVER.md)
+- [Install(Bt Panel)](install/BT.md)
 
 ## Website
 
@@ -21,7 +21,7 @@
 
 ## WeChat
 
-- ![WeChat](./resources/assets/statics/other/wxqr.jpeg)
+- ![WeChat](resources/assets/statics/other/wxqr.jpeg)
 
 ## Technology
 
@@ -38,16 +38,16 @@
 ## Function
 
 **1. Four quadrants: Highlight priorities, help employees arrange their time properly, and improve work efficiency**
-![Four quadrants: Highlight priorities, help employees arrange their time properly, and improve work efficiency](./resources/assets/statics/images/index/todo.jpg)
+![Four quadrants: Highlight priorities, help employees arrange their time properly, and improve work efficiency](resources/assets/statics/images/index/todo.jpg)
 
 **2. Online flow chart: online flow chart tool, easy to use**
-![Online flow chart: online flow chart tool, easy to use](./resources/assets/statics/images/index/banner/1.jpg)
+![Online flow chart: online flow chart tool, easy to use](resources/assets/statics/images/index/banner/1.jpg)
 
 **3. Online mind mapping: Organize your thoughts and optimize your workflow**
-![Online mind mapping: Organize your thoughts and optimize your workflow](./resources/assets/statics/images/index/banner/2.jpg)
+![Online mind mapping: Organize your thoughts and optimize your workflow](resources/assets/statics/images/index/banner/2.jpg)
 
 **4. Project management: Custom project kanban, visual task scheduling**
-![Project management: Custom project kanban, visual task scheduling](./resources/assets/statics/images/index/project.jpg)
+![Project management: Custom project kanban, visual task scheduling](resources/assets/statics/images/index/project.jpg)
 
 **5. Online knowledge base: online flowcharts, online documentation, and visual catalogs, document management without worry**
-![Online knowledge base: online flowcharts, online documentation, and visual catalogs, document management without worry](./resources/assets/statics/images/index/wiki.jpg)
+![Online knowledge base: online flowcharts, online documentation, and visual catalogs, document management without worry](resources/assets/statics/images/index/wiki.jpg)

+ 10 - 10
README.md

@@ -1,6 +1,6 @@
 # 产品介绍
 
-**[English Documentation](./README-EN.md)**
+**[English Documentation](README-EN.md)**
 
 - `wookteam` 是一款轻量级的在线团队协作工具,提供各类文档工具、在线思维导图、在线流程图、项目管理、任务分发,知识库管理等工具。
 - `wookteam` 支持团队在线聊天沟通,订阅任务动态实时推送。
@@ -8,9 +8,9 @@
 
 ## 安装教程
 
-- [安装教程(Docker)](./INSTALL.md#安装设置使用docker)
-- [安装教程(宝塔面板)](./INSTALL-BT.md)
-- [安装教程(服务器)](./INSTALL.md#安装设置如果你没有使用docker)
+- [安装教程(Docker)](install/DOCKER.md)
+- [安装教程(服务器)](install/SERVER.md)
+- [安装教程(宝塔面板)](install/BT.md)
 
 ## 官网地址
 
@@ -22,7 +22,7 @@
 
 ## 微信咨询
 
-- ![二维码](./resources/assets/statics/other/wxqr.jpeg)
+- ![二维码](resources/assets/statics/other/wxqr.jpeg)
 
 ## 技术选型
 
@@ -39,16 +39,16 @@
 ## 功能简介
 
 **1. 待办四象限:突出事情优先级,帮助员工合理安排时间,提高工作效率**
-![待办四象限:突出事情优先级,帮助员工合理安排时间,提高工作效率](./resources/assets/statics/images/index/todo.jpg)
+![待办四象限:突出事情优先级,帮助员工合理安排时间,提高工作效率](resources/assets/statics/images/index/todo.jpg)
 
 **2. 在线流程图:在线流程图工具,使用方便**
-![在线流程图:在线流程图工具,使用方便](./resources/assets/statics/images/index/banner/1.jpg)
+![在线流程图:在线流程图工具,使用方便](resources/assets/statics/images/index/banner/1.jpg)
 
 **3. 在线思维导图:梳理思路,优化工作流程**
-![在线思维导图:梳理思路,优化工作流程](./resources/assets/statics/images/index/banner/2.jpg)
+![在线思维导图:梳理思路,优化工作流程](resources/assets/statics/images/index/banner/2.jpg)
 
 **4. 项目管理:自定义项目看板,可视化任务安排**
-![项目管理:自定义项目看板,可视化任务安排](./resources/assets/statics/images/index/project.jpg)
+![项目管理:自定义项目看板,可视化任务安排](resources/assets/statics/images/index/project.jpg)
 
 **5. 在线知识库:在线流程图,在线文档,以及可视化的目录编排,文档管理无忧**
-![在线知识库:在线流程图,在线文档,以及可视化的目录编排,文档管理无忧](./resources/assets/statics/images/index/wiki.jpg)
+![在线知识库:在线流程图,在线文档,以及可视化的目录编排,文档管理无忧](resources/assets/statics/images/index/wiki.jpg)

+ 27 - 3
INSTALL-BT.md

@@ -2,6 +2,12 @@
 
 > 此教程是在`Centos 7`下安装的宝塔面板。
 
+- [安装教程(Docker)](DOCKER.md)
+- [安装教程(服务器)](SERVER.md)
+- **安装教程(宝塔面板)**
+
+## 安装设置
+
 ### 1、安装宝塔控制面板
 
 请移步至宝塔官方 https://www.bt.cn/
@@ -51,7 +57,7 @@ upstream swoole {
 
 如下图:
 
-![](./resources/assets/statics/other/bt/1.png)
+![](../resources/assets/statics/other/bt/1.png)
 
 - 网站伪静态设为:
 
@@ -136,8 +142,9 @@ stdout_logfile=/www/wwwroot/wookteam.com/%(program_name)s.log
 ```
 
 - 运行以下命令:
-```
-systemctl restart supervisord
+
+```bash
+$ systemctl restart supervisord
 ```
 
 到此安装完毕,希望你使用愉快!
@@ -146,3 +153,20 @@ systemctl restart supervisord
 
 - admin/123456
 - system/123456
+
+## 升级更新
+
+- 进入服务器,切换至网站目录,然后依次运行一下命令:
+
+```bash
+$ git fetch --all
+$ git reset --hard origin/master
+$ git pull
+$ composer install
+$ php artisan migrate
+
+$ npm install
+$ npm run production
+
+$ systemctl restart supervisord
+```

+ 98 - 0
install/DOCKER.md

@@ -0,0 +1,98 @@
+# 安装教程
+
+**[English Documentation](en/DOCKER.md)**
+
+- **安装教程(Docker)**
+- [安装教程(服务器)](SERVER.md)
+- [安装教程(宝塔面板)](BT.md)
+
+## 安装设置(使用Docker)
+
+> 必须安装 `Docker` 和 `Docker Compose`
+
+#### 1、克隆项目到您的本地或服务器
+
+```bash
+// 使用ssh
+$ git clone git@github.com:kuaifan/wookteam.git
+// 或者你也可以使用https
+$ git clone https://github.com/kuaifan/wookteam.git
+
+// 进入目录
+$ cd wookteam
+
+// 拷贝 .env
+$ cp .env.docker .env
+```
+
+#### 2、构建项目
+
+```bash
+$ ./cmd build php
+$ ./cmd composer install
+$ ./cmd artisan key:generate
+$ ./cmd artisan migrate --seed
+$ ./cmd php bin/wookteam --port=8080
+$ ./cmd up -d
+$ ./cmd npm install
+$ ./cmd npm run prod
+$ ./cmd supervisorctl restart all
+```
+
+到此安装完毕,项目地址为:**`http://IP:PORT`**(`PORT`为构建项目中的参数`8080`)。
+
+### 更换端口
+
+```bash
+$ ./cmd php bin/wookteam --port=8080
+$ ./cmd up -d
+```
+
+### 停止服务
+
+```bash
+$ ./cmd stop
+```
+
+> 一旦应用程序被设置,无论何时你想要启动服务器(如果它被停止)运行以下命令
+
+```bash
+$ ./cmd start
+```
+
+### 运行命令的快捷方式
+
+> 你可以使用以下命令来执行
+
+```bash
+$ ./cmd artisan "your command"          // 运行 artisan 命令
+$ ./cmd php "your command"              // 运行 php 命令
+$ ./cmd composer "your command"         // 运行 composer 命令
+$ ./cmd supervisorctl "your command"    // 运行 supervisorctl 命令
+$ ./cmd test "your command"             // 运行 phpunit 命令
+$ ./cmd npm "your command"              // 运行 npm 命令
+$ ./cmd yarn "your command"             // 运行 yarn 命令
+$ ./cmd mysql "your command"            // 运行 mysql 命令
+```
+
+## 默认账号
+
+- admin/123456
+- system/123456
+
+## 升级更新
+
+- 进入目录,依次运行一下命令:
+
+```bash
+$ git fetch --all
+$ git reset --hard origin/master
+$ git pull
+$ ./cmd composer install
+$ ./cmd artisan migrate
+
+$ ./cmd npm install
+$ ./cmd npm run prod
+
+$ ./cmd supervisorctl restart all
+```

+ 23 - 70
INSTALL.md

@@ -1,77 +1,12 @@
 # 安装教程
 
-**[English Documentation](./INSTALL-EN.md)**
+**[English Documentation](en/SERVER.md)**
 
-## 安装设置(使用Docker)
+- [安装教程(Docker)](DOCKER.md)
+- **安装教程(服务器)**
+- [安装教程(宝塔面板)](BT.md)
 
-> 必须安装 `Docker` 和 `Docker Compose`
-
-#### 1、克隆项目到您的本地或服务器
-
-```bash
-// 使用ssh
-$ git clone git@github.com:kuaifan/wookteam.git
-// 或者你也可以使用https
-$ git clone https://github.com/kuaifan/wookteam.git
-
-// 进入目录
-$ cd wookteam
-
-// 拷贝 .env
-$ cp .env.docker .env
-```
-
-#### 2、构建项目
-
-```bash
-$ ./cmd build php
-$ ./cmd composer install
-$ ./cmd artisan key:generate
-$ ./cmd artisan migrate --seed
-$ ./cmd php bin/wookteam --port=8080
-$ ./cmd up -d
-$ ./cmd npm install
-$ ./cmd npm run prod
-$ ./cmd supervisorctl restart all
-```
-
-到此安装完毕,项目地址为:**`http://IP:PORT`**(`PORT`为构建项目中的参数`8080`)。
-
-### 更换端口
-
-```bash
-$ ./cmd php bin/wookteam --port=8080
-$ ./cmd up -d
-```
-
-### 停止服务
-
-```bash
-$ ./cmd stop
-```
-
-> 一旦应用程序被设置,无论何时你想要启动服务器(如果它被停止)运行以下命令
-
-```bash
-$ ./cmd start
-```
-
-### 运行命令的快捷方式
-
-> 你可以使用以下命令来执行
-
-```bash
-$ ./cmd artisan "your command"          // 运行 artisan 命令
-$ ./cmd php "your command"              // 运行 php 命令
-$ ./cmd composer "your command"         // 运行 composer 命令
-$ ./cmd supervisorctl "your command"    // 运行 supervisorctl 命令
-$ ./cmd test "your command"             // 运行 phpunit 命令
-$ ./cmd npm "your command"              // 运行 npm 命令
-$ ./cmd yarn "your command"             // 运行 yarn 命令
-$ ./cmd mysql "your command"            // 运行 mysql 命令
-```
-
-## 安装设置(如果你没有使用docker)
+## 安装设置(服务器)
 
 > Fork the repo if you are outside collaborator https://github.com/kuaifan/wookteam.
 
@@ -210,3 +145,21 @@ server {
 
 - admin/123456
 - system/123456
+
+## 升级更新
+
+- 进入目录,依次运行一下命令:
+
+```bash
+$ git fetch --all
+$ git reset --hard origin/master
+$ git pull
+$ composer install
+$ php artisan migrate
+
+$ npm install
+$ npm run production
+
+$ php bin/laravels start # 如果使用Supervisord则重启Supervisord
+```
+

+ 98 - 0
install/en/DOCKER.md

@@ -0,0 +1,98 @@
+# Install
+
+**[中文文档](../DOCKER.md)**
+
+- **Install(Docker)**
+- [Install(Server)](SERVER.md)
+- [Install(Bt Panel)](../BT.md)
+
+## Setup (using Docker)
+
+> `Docker` & `Docker Compose` must be installed
+
+#### 1. Clone the repository
+
+```bash
+// using ssh
+$ git clone git@github.com:kuaifan/wookteam.git
+// or you can use https
+$ git clone https://github.com/kuaifan/wookteam.git
+
+// enter directory
+$ cd wookteam
+
+// copy .env
+$ cp .env.docker .env
+```
+
+#### 2. Build image & install
+
+```bash
+$ ./cmd build php
+$ ./cmd composer install
+$ ./cmd artisan key:generate
+$ ./cmd artisan migrate --seed
+$ ./cmd php bin/wookteam --port=8080
+$ ./cmd up -d
+$ ./cmd npm install
+$ ./cmd npm run prod
+$ ./cmd supervisorctl restart all
+```
+
+Installed, project url: **`http://IP:PORT`** (`PORT` is the parameter `8080` in the build).
+
+### Change port
+
+```bash
+$ ./cmd php bin/wookteam --port=8080
+$ ./cmd up -d
+```
+
+#### Stop server
+
+```bash
+$ ./cmd stop
+```
+
+> P.S: Once application is setup, whenever you want to start the server (if it is stopped) run below command
+
+```bash
+$ ./cmd start
+```
+
+### Shortcuts for running command
+
+> You can do this using the following command
+
+```bash
+$ ./cmd artisan "your command"          // To run a artisan command
+$ ./cmd php "your command"              // To run a php command
+$ ./cmd composer "your command"         // To run a composer command
+$ ./cmd supervisorctl "your command"    // To run a supervisorctl command
+$ ./cmd test "your command"             // To run a phpunit command
+$ ./cmd npm "your command"              // To run a npm command
+$ ./cmd yarn "your command"             // To run a yarn command
+$ ./cmd mysql "your command"            // To run a mysql command
+```
+
+## Default Account
+
+- admin/123456
+- system/123456
+
+## Upgrade
+
+- Enter the directory and run the following command in turn:
+
+```bash
+$ git fetch --all
+$ git reset --hard origin/master
+$ git pull
+$ ./cmd composer install
+$ ./cmd artisan migrate
+
+$ ./cmd npm install
+$ ./cmd npm run prod
+
+$ ./cmd supervisorctl restart all
+```

+ 22 - 70
INSTALL-EN.md

@@ -1,77 +1,12 @@
 # Install
 
-**[中文文档](./INSTALL.md)**
+**[中文文档](../SERVER.md)**
 
-## Setup (using Docker)
+- [Install(Docker)](DOCKER.md)
+- **Install(Server)**
+- [Install(Bt Panel)](../BT.md)
 
-> `Docker` & `Docker Compose` must be installed
-
-#### 1. Clone the repository
-
-```bash
-// using ssh
-$ git clone git@github.com:kuaifan/wookteam.git
-// or you can use https
-$ git clone https://github.com/kuaifan/wookteam.git
-
-// enter directory
-$ cd wookteam
-
-// copy .env
-$ cp .env.docker .env
-```
-
-#### 2. Build image & install
-
-```bash
-$ ./cmd build php
-$ ./cmd composer install
-$ ./cmd artisan key:generate
-$ ./cmd artisan migrate --seed
-$ ./cmd php bin/wookteam --port=8080
-$ ./cmd up -d
-$ ./cmd npm install
-$ ./cmd npm run prod
-$ ./cmd supervisorctl restart all
-```
-
-Installed, project url: **`http://IP:PORT`** (`PORT` is the parameter `8080` in the build).
-
-### Change port
-
-```bash
-$ ./cmd php bin/wookteam --port=8080
-$ ./cmd up -d
-```
-
-#### Stop server
-
-```bash
-$ ./cmd stop
-```
-
-> P.S: Once application is setup, whenever you want to start the server (if it is stopped) run below command
-
-```bash
-$ ./cmd start
-```
-
-### Shortcuts for running command
-
-> You can do this using the following command
-
-```bash
-$ ./cmd artisan "your command"          // To run a artisan command
-$ ./cmd php "your command"              // To run a php command
-$ ./cmd composer "your command"         // To run a composer command
-$ ./cmd supervisorctl "your command"    // To run a supervisorctl command
-$ ./cmd test "your command"             // To run a phpunit command
-$ ./cmd npm "your command"              // To run a npm command
-$ ./cmd yarn "your command"             // To run a yarn command
-$ ./cmd mysql "your command"            // To run a mysql command
-```
-
-## Setup (if you're not using docker)
+## Setup (Server)
 
 > Fork the repo if you are outside collaborator https://github.com/kuaifan/wookteam.
 
@@ -210,3 +145,20 @@ server {
 
 - admin/123456
 - system/123456
+
+## Upgrade
+
+- Enter the directory and run the following command in turn:
+
+```bash
+$ git fetch --all
+$ git reset --hard origin/master
+$ git pull
+$ composer install
+$ php artisan migrate
+
+$ npm install
+$ npm run production
+
+$ php bin/laravels start # If use Supervisord restart Supervisord
+```