kuaifan 4 years atrás
parent
commit
a7dbbcf017
100 changed files with 1007 additions and 48 deletions
  1. 0 10
      install/BT.md
  2. 1 13
      install/SERVER-FULL.md
  3. 6 12
      install/SERVER.md
  4. 6 12
      install/en/SERVER.md
  5. 1 1
      package.json
  6. BIN
      public/audio/call.mp3
  7. BIN
      public/audio/call.wav
  8. BIN
      public/audio/message.mp3
  9. BIN
      public/audio/message.wav
  10. 1 0
      public/css/app.css
  11. 870 0
      public/css/fonts/ionicons.svg
  12. BIN
      public/css/fonts/ionicons.ttf
  13. BIN
      public/css/fonts/ionicons.woff
  14. BIN
      public/css/fonts/ionicons.woff2
  15. 1 0
      public/css/iview.css
  16. BIN
      public/fonts/pages/main/components/MDEditor/assets/font/iconfont.eot
  17. 119 0
      public/fonts/pages/main/components/MDEditor/assets/font/iconfont.svg
  18. BIN
      public/fonts/pages/main/components/MDEditor/assets/font/iconfont.ttf
  19. BIN
      public/fonts/pages/main/components/MDEditor/assets/font/iconfont.woff
  20. BIN
      public/fonts/sass/fonts/-_Ctzj9b56b8RgXW8FAriQzyDMXhdD8sAj6OAJTFsBI.woff2
  21. BIN
      public/fonts/sass/fonts/QAUlVt1jXOgQavlW5wEfxQLUuEpTyoUstqEm5AMlJo4.woff2
  22. BIN
      public/fonts/sass/fonts/STBOO2waD2LpX45SXYjQBQsYbbCjybiHxArTLjt7FRU.woff2
  23. BIN
      public/fonts/sass/fonts/YZaO6llzOP57DpTBv2GnyFKPGs1ZzpMvnHX-7fPOuAc.woff2
  24. BIN
      public/fonts/sass/fonts/ZKwULyCG95tk6mOqHQfRBAsYbbCjybiHxArTLjt7FRU.woff2
  25. BIN
      public/fonts/sass/fonts/xkvoNo9fC8O2RDydKj12bwzyDMXhdD8sAj6OAJTFsBI.woff2
  26. BIN
      public/fonts/sass/fonts/zenicon.woff2
  27. BIN
      public/images/bg/1.jpg
  28. BIN
      public/images/bg/10.jpg
  29. BIN
      public/images/bg/11.jpg
  30. BIN
      public/images/bg/12.jpg
  31. BIN
      public/images/bg/2.jpg
  32. BIN
      public/images/bg/3.jpg
  33. BIN
      public/images/bg/4.jpg
  34. BIN
      public/images/bg/5.jpg
  35. BIN
      public/images/bg/6.jpg
  36. BIN
      public/images/bg/7.jpg
  37. BIN
      public/images/bg/8.jpg
  38. BIN
      public/images/bg/9.jpg
  39. BIN
      public/images/bg/thumb/1.jpg
  40. BIN
      public/images/bg/thumb/10.jpg
  41. BIN
      public/images/bg/thumb/11.jpg
  42. BIN
      public/images/bg/thumb/12.jpg
  43. BIN
      public/images/bg/thumb/2.jpg
  44. BIN
      public/images/bg/thumb/3.jpg
  45. BIN
      public/images/bg/thumb/4.jpg
  46. BIN
      public/images/bg/thumb/5.jpg
  47. BIN
      public/images/bg/thumb/6.jpg
  48. BIN
      public/images/bg/thumb/7.jpg
  49. BIN
      public/images/bg/thumb/8.jpg
  50. BIN
      public/images/bg/thumb/9.jpg
  51. BIN
      public/images/browser/360.png
  52. BIN
      public/images/browser/chrome.png
  53. BIN
      public/images/browser/firefox.png
  54. BIN
      public/images/browser/ie.png
  55. BIN
      public/images/browser/safari.png
  56. BIN
      public/images/files/ai.png
  57. BIN
      public/images/files/avi.png
  58. BIN
      public/images/files/bmp.png
  59. BIN
      public/images/files/cdr.png
  60. BIN
      public/images/files/doc.png
  61. BIN
      public/images/files/document.png
  62. BIN
      public/images/files/eps.png
  63. BIN
      public/images/files/exe.png
  64. BIN
      public/images/files/file.png
  65. BIN
      public/images/files/flow.png
  66. BIN
      public/images/files/folder.png
  67. BIN
      public/images/files/gif.png
  68. BIN
      public/images/files/html.png
  69. BIN
      public/images/files/mind.png
  70. BIN
      public/images/files/mov.png
  71. BIN
      public/images/files/mp3.png
  72. BIN
      public/images/files/mp4.png
  73. BIN
      public/images/files/pdf.png
  74. BIN
      public/images/files/ppt.png
  75. BIN
      public/images/files/pr.png
  76. BIN
      public/images/files/psd.png
  77. BIN
      public/images/files/rar.png
  78. BIN
      public/images/files/sheet.png
  79. BIN
      public/images/files/svg.png
  80. BIN
      public/images/files/tif.png
  81. BIN
      public/images/files/txt.png
  82. BIN
      public/images/files/xls.png
  83. BIN
      public/images/files/zip.png
  84. BIN
      public/images/other/aiwrap.png
  85. BIN
      public/images/other/alipay.png
  86. BIN
      public/images/other/avatar.png
  87. BIN
      public/images/other/dir.png
  88. BIN
      public/images/other/imgerr.jpg
  89. BIN
      public/images/other/qq.png
  90. BIN
      public/images/other/weixin.png
  91. BIN
      public/images/statics/images/index/banner/1.jpg
  92. BIN
      public/images/statics/images/index/banner/2.jpg
  93. BIN
      public/images/statics/images/index/project.jpg
  94. BIN
      public/images/statics/images/index/todo.jpg
  95. BIN
      public/images/statics/images/index/week.jpg
  96. BIN
      public/images/statics/images/index/wiki.jpg
  97. BIN
      public/images/statics/images/logo-white.png
  98. 1 0
      public/images/statics/images/plans/1.svg
  99. 1 0
      public/images/statics/images/plans/2.svg
  100. 0 0
      public/images/statics/images/plans/3.svg

+ 0 - 10
install/BT.md

@@ -19,7 +19,6 @@
 - Nginx
 - MySQL-5.7+
 - PHP-7.3+
-- PM2管理器
 
 安装完以后打开`PHP`设置安装`fileinfo`、`Swoole4`扩展及删除禁用函数`pcntl`、`putenv`、`proc_open`、`popen`。
 
@@ -109,13 +108,8 @@ cd /www/wwwroot/wookteam.com
 composer install
 php artisan key:generate
 php artisan migrate --seed
-
-npm install
-npm run production
 ```
 
-> 如果提示`npm: command not found`请重启服务器或者运行`source ~/.bash_profile`后再试
-
 ### 5、安装配置Supervisor
 
 - 进入服务器,依次运行一下命令:
@@ -164,9 +158,5 @@ systemctl restart supervisord
 ```bash
 composer update
 php artisan migrate
-
-npm install
-npm run production
-
 systemctl restart supervisord
 ```

+ 1 - 13
install/SERVER-FULL.md

@@ -77,12 +77,6 @@ grep 'temporary password' /var/log/mysqld.log
 yum install -y supervisor && systemctl enable supervisord && systemctl start supervisord
 ```
 
-## 安装NodeJs12
-
-```sh
-curl -sL https://rpm.nodesource.com/setup_12.x | sudo bash - && yum install -y nodejs
-```
-
 ## 安装git
 
 ```sh
@@ -144,9 +138,6 @@ DB_PASSWORD=Aa111111.
 composer install
 php artisan key:generate
 php artisan migrate --seed
-
-npm install
-npm run production
 ```
 
 ### 创建Supervisor进程
@@ -267,12 +258,9 @@ cd /var/www/wookteam/
 git fetch --all
 git reset --hard origin/master
 git pull
+
 composer update
 php artisan migrate
-
-npm install
-npm run production
-
 systemctl restart supervisord
 ```
 

+ 6 - 12
install/SERVER.md

@@ -13,21 +13,21 @@
 #### 1、克隆项目到您的本地或服务器
 
 ```bash
-// 使用ssh
+# 使用ssh
 git clone git@github.com:kuaifan/wookteam.git
-// 或者你也可以使用https
+# 或者你也可以使用https
 git clone https://github.com/kuaifan/wookteam.git
 
-// 进入目录
+# 进入目录
 cd wookteam
 
-// 拷贝 .env
+# 拷贝 .env
 cp .env.example .env
 ```
 
 #### 2、修改`.env`
 
-> 数据库信息、WebSocket
+> 数据库信息
 
 ```env
 DB_CONNECTION=mysql
@@ -50,9 +50,6 @@ git pull origin master # 如果使用dev分支进行本地开发
 composer install
 php artisan key:generate
 php artisan migrate --seed
-
-npm install
-npm run production
 ```
 
 #### 4、运行 Laravels (WebSocket)
@@ -156,12 +153,9 @@ server {
 git fetch --all
 git reset --hard origin/master
 git pull
+
 composer update
 php artisan migrate
-
-npm install
-npm run production
-
 php bin/laravels start # 如果使用Supervisord则重启Supervisord
 ```
 

+ 6 - 12
install/en/SERVER.md

@@ -13,21 +13,21 @@
 #### 1. Clone the project to your local or server
 
 ```bash
-// using ssh
+# using ssh
 git clone git@github.com:kuaifan/wookteam.git
-// or you can use https
+# or you can use https
 git clone https://github.com/kuaifan/wookteam.git
 
-// enter directory
+# enter directory
 cd wookteam
 
-// copy .env
+# copy .env
 cp .env.example .env
 ```
 
 #### 2. Modify`.env`
 
-> Database、WebSocket
+> Database...
 
 ```env
 DB_CONNECTION=mysql
@@ -50,9 +50,6 @@ git pull origin master # use dev branch for local development
 composer install
 php artisan key:generate
 php artisan migrate --seed
-
-npm install
-npm run production
 ```
 
 #### 4. Run Laravels (WebSocket)
@@ -156,11 +153,8 @@ server {
 git fetch --all
 git reset --hard origin/master
 git pull
+
 composer update
 php artisan migrate
-
-npm install
-npm run production
-
 php bin/laravels start # If use Supervisord restart Supervisord
 ```

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
     "name": "wookteam",
-    "version": "1.6.1",
+    "version": "1.6.2",
     "description": "WookTeam是一款轻量级的开源在线团队协作工具,提供各类文档工具、在线思维导图、在线流程图、项目管理、任务分发、即时IM,知识库管理等工具。",
     "scripts": {
         "ide-helper": "php artisan ide-helper:generate",

BIN
public/audio/call.mp3


BIN
public/audio/call.wav


BIN
public/audio/message.mp3


BIN
public/audio/message.wav


File diff suppressed because it is too large
+ 1 - 0
public/css/app.css


File diff suppressed because it is too large
+ 870 - 0
public/css/fonts/ionicons.svg


BIN
public/css/fonts/ionicons.ttf


BIN
public/css/fonts/ionicons.woff


BIN
public/css/fonts/ionicons.woff2


File diff suppressed because it is too large
+ 1 - 0
public/css/iview.css


BIN
public/fonts/pages/main/components/MDEditor/assets/font/iconfont.eot


File diff suppressed because it is too large
+ 119 - 0
public/fonts/pages/main/components/MDEditor/assets/font/iconfont.svg


BIN
public/fonts/pages/main/components/MDEditor/assets/font/iconfont.ttf


BIN
public/fonts/pages/main/components/MDEditor/assets/font/iconfont.woff


BIN
public/fonts/sass/fonts/-_Ctzj9b56b8RgXW8FAriQzyDMXhdD8sAj6OAJTFsBI.woff2


BIN
public/fonts/sass/fonts/QAUlVt1jXOgQavlW5wEfxQLUuEpTyoUstqEm5AMlJo4.woff2


BIN
public/fonts/sass/fonts/STBOO2waD2LpX45SXYjQBQsYbbCjybiHxArTLjt7FRU.woff2


BIN
public/fonts/sass/fonts/YZaO6llzOP57DpTBv2GnyFKPGs1ZzpMvnHX-7fPOuAc.woff2


BIN
public/fonts/sass/fonts/ZKwULyCG95tk6mOqHQfRBAsYbbCjybiHxArTLjt7FRU.woff2


BIN
public/fonts/sass/fonts/xkvoNo9fC8O2RDydKj12bwzyDMXhdD8sAj6OAJTFsBI.woff2


BIN
public/fonts/sass/fonts/zenicon.woff2


BIN
public/images/bg/1.jpg


BIN
public/images/bg/10.jpg


BIN
public/images/bg/11.jpg


BIN
public/images/bg/12.jpg


BIN
public/images/bg/2.jpg


BIN
public/images/bg/3.jpg


BIN
public/images/bg/4.jpg


BIN
public/images/bg/5.jpg


BIN
public/images/bg/6.jpg


BIN
public/images/bg/7.jpg


BIN
public/images/bg/8.jpg


BIN
public/images/bg/9.jpg


BIN
public/images/bg/thumb/1.jpg


BIN
public/images/bg/thumb/10.jpg


BIN
public/images/bg/thumb/11.jpg


BIN
public/images/bg/thumb/12.jpg


BIN
public/images/bg/thumb/2.jpg


BIN
public/images/bg/thumb/3.jpg


BIN
public/images/bg/thumb/4.jpg


BIN
public/images/bg/thumb/5.jpg


BIN
public/images/bg/thumb/6.jpg


BIN
public/images/bg/thumb/7.jpg


BIN
public/images/bg/thumb/8.jpg


BIN
public/images/bg/thumb/9.jpg


BIN
public/images/browser/360.png


BIN
public/images/browser/chrome.png


BIN
public/images/browser/firefox.png


BIN
public/images/browser/ie.png


BIN
public/images/browser/safari.png


BIN
public/images/files/ai.png


BIN
public/images/files/avi.png


BIN
public/images/files/bmp.png


BIN
public/images/files/cdr.png


BIN
public/images/files/doc.png


BIN
public/images/files/document.png


BIN
public/images/files/eps.png


BIN
public/images/files/exe.png


BIN
public/images/files/file.png


BIN
public/images/files/flow.png


BIN
public/images/files/folder.png


BIN
public/images/files/gif.png


BIN
public/images/files/html.png


BIN
public/images/files/mind.png


BIN
public/images/files/mov.png


BIN
public/images/files/mp3.png


BIN
public/images/files/mp4.png


BIN
public/images/files/pdf.png


BIN
public/images/files/ppt.png


BIN
public/images/files/pr.png


BIN
public/images/files/psd.png


BIN
public/images/files/rar.png


BIN
public/images/files/sheet.png


BIN
public/images/files/svg.png


BIN
public/images/files/tif.png


BIN
public/images/files/txt.png


BIN
public/images/files/xls.png


BIN
public/images/files/zip.png


BIN
public/images/other/aiwrap.png


BIN
public/images/other/alipay.png


BIN
public/images/other/avatar.png


BIN
public/images/other/dir.png


BIN
public/images/other/imgerr.jpg


BIN
public/images/other/qq.png


BIN
public/images/other/weixin.png


BIN
public/images/statics/images/index/banner/1.jpg


BIN
public/images/statics/images/index/banner/2.jpg


BIN
public/images/statics/images/index/project.jpg


BIN
public/images/statics/images/index/todo.jpg


BIN
public/images/statics/images/index/week.jpg


BIN
public/images/statics/images/index/wiki.jpg


BIN
public/images/statics/images/logo-white.png


File diff suppressed because it is too large
+ 1 - 0
public/images/statics/images/plans/1.svg


File diff suppressed because it is too large
+ 1 - 0
public/images/statics/images/plans/2.svg


+ 0 - 0
public/images/statics/images/plans/3.svg


Some files were not shown because too many files changed in this diff