kuaifan 5 rokov pred
rodič
commit
b905631056

+ 5 - 0
INSTALL-BT.md

@@ -141,3 +141,8 @@ systemctl restart supervisord
 ```
 
 到此安装完毕,希望你使用愉快!
+
+## 默认账号
+
+- admin/123456
+- system/123456

+ 28 - 58
INSTALL-EN.md

@@ -21,62 +21,39 @@ $ cd wookteam
 $ cp .env.docker .env
 ```
 
-#### 2. Modify`.env`
-
-`APP_PORT`= (whatever port you want to run the app)
-
-`DB_HOST`= (Value should be`mariadb`)
-
-`DB_DATABASE`= (Add value as you wish)
-
-`DB_USERNAME`= (Add value as you wish)
-
-`DB_PASSWORD`= (Add value as you wish)
-
-`DB_ROOT_PASSWORD`= (Add value as you wish)
+#### 2. Build image & install
 
-> example:
-
-```env
-APP_PORT=80
-......
-DB_CONNECTION=mysql
-DB_HOST=mariadb
-DB_PORT=3306
-DB_DATABASE=wookteam
-DB_USERNAME=wookteam
-DB_PASSWORD=123456
-DB_ROOT_PASSWORD=123456
-......
-LARAVELS_LISTEN_IP=0.0.0.0
-LARAVELS_LISTEN_PORT=5200
+```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
 ```
 
-#### 3. Build image & install
+Installed, project url: **`http://IP:PORT`** (`PORT` is the parameter `8080` in the build).
+
+### Change port
 
 ```bash
-./cmd build php
-./cmd composer install
-./cmd up -d
-./cmd artisan key:generate
-./cmd artisan migrate --seed
-./cmd npm install
-./cmd npm run prod
-./cmd supervisorctl restart all
+$ ./cmd php bin/wookteam --port=8080
+$ ./cmd up -d
 ```
 
-Installed, project url: **`http://IP:APP_PORT`**.
-
-#### To stop the app server
+#### Stop server
 
 ```bash
-./cmd stop
+$ ./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
+$ ./cmd start
 ```
 
 ### Shortcuts for running command
@@ -84,21 +61,14 @@ Installed, project url: **`http://IP:APP_PORT`**.
 > 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
+$ ./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)
@@ -236,7 +206,7 @@ server {
 }
 ```
 
-## Account
+## Default Account
 
 - admin/123456
 - system/123456

+ 27 - 57
INSTALL.md

@@ -21,62 +21,39 @@ $ cd wookteam
 $ cp .env.docker .env
 ```
 
-#### 2、修改`.env`
-
-`APP_PORT`= (你想要运行应用程序的任何端口)
-
-`DB_HOST`= (值应该是`mariadb`)
-
-`DB_DATABASE`= (设置你想要的数据库名称)
-
-`DB_USERNAME`= (设置你想要的数据库用户名)
-
-`DB_PASSWORD`= (设置你想要的数据库密码)
-
-`DB_ROOT_PASSWORD`= (设置你想要的数据库root密码)
+#### 2、构建项目
 
-> 设置例子:
-
-```env
-APP_PORT=80
-......
-DB_CONNECTION=mysql
-DB_HOST=mariadb
-DB_PORT=3306
-DB_DATABASE=wookteam
-DB_USERNAME=wookteam
-DB_PASSWORD=123456
-DB_ROOT_PASSWORD=123456
-......
-LARAVELS_LISTEN_IP=0.0.0.0
-LARAVELS_LISTEN_PORT=5200
+```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
 ```
 
-#### 3、构建项目
+到此安装完毕,项目地址为:**`http://IP:PORT`**(`PORT`为构建项目中的参数`8080`)。
+
+### 更换端口
 
 ```bash
-./cmd build php
-./cmd composer install
-./cmd up -d
-./cmd artisan key:generate
-./cmd artisan migrate --seed
-./cmd npm install
-./cmd npm run prod
-./cmd supervisorctl restart all
+$ ./cmd php bin/wookteam --port=8080
+$ ./cmd up -d
 ```
 
-到此安装完毕,项目地址为:**`http://IP:APP_PORT`**。
-
-#### 停止服务
+### 停止服务
 
 ```bash
-./cmd stop
+$ ./cmd stop
 ```
 
 > 一旦应用程序被设置,无论何时你想要启动服务器(如果它被停止)运行以下命令
 
 ```bash
-./cmd start
+$ ./cmd start
 ```
 
 ### 运行命令的快捷方式
@@ -84,21 +61,14 @@ LARAVELS_LISTEN_PORT=5200
 > 你可以使用以下命令来执行
 
 ```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 命令
+$ ./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)

+ 6 - 4
README-EN.md

@@ -6,13 +6,15 @@
 - `wookteam` Support team online chat communication, subscribe task dynamic real-time push.
 - **`wookteam` All open source.**
 
-## Website
-
-- [https://www.wookteam.com](https://www.wookteam.com)
+## 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)
 
+## Website
+
+- [https://www.wookteam.com](https://www.wookteam.com)
+
 ## Demo
 
 - [https://demo.wookteam.com](https://demo.wookteam.com) (admin/123456)
@@ -29,7 +31,7 @@
 - Communication: Swoole
 - Theme style: Kooteam
 
-## 国际化
+## Internationalization
 
 - `WookTeam`Support internationalization, support: simplified Chinese, English, English translation from Google translation. If you have a better grammar you are welcome to write it. [Translation data](https://docs.google.com/spreadsheets/d/1m0de8-5vCwjKRwW_lsgzsi8wmOmQRl_bIMGN988Keak/edit?usp=sharing)
 

+ 5 - 2
README.md

@@ -6,13 +6,16 @@
 - `wookteam` 支持团队在线聊天沟通,订阅任务动态实时推送。
 - **`wookteam` 全部开源。**
 
-## 官网地址
+## 安装教程
 
-- [https://www.wookteam.com](https://www.wookteam.com)
 - [安装教程(Docker)](./INSTALL.md#安装设置使用docker)
 - [安装教程(宝塔面板)](./INSTALL-BT.md)
 - [安装教程(服务器)](./INSTALL.md#安装设置如果你没有使用docker)
 
+## 官网地址
+
+- [https://www.wookteam.com](https://www.wookteam.com)
+
 ## 演示地址
 
 - [https://demo.wookteam.com](https://demo.wookteam.com) (admin/123456)

+ 34 - 0
bin/wookteam

@@ -0,0 +1,34 @@
+#!/usr/bin/env php
+<?php
+
+/**
+ * Class wookteamLoader
+ */
+class wookteamLoader
+{
+    function modifyEnv(array $data)
+    {
+        if (empty($data) || !is_array($data)) {
+            return false;
+        }
+        $envPath = realpath(__DIR__ . '/../') . DIRECTORY_SEPARATOR . '.env';
+        if (!file_exists($envPath)) {
+            return false;
+        }
+        $envContent = file_get_contents($envPath);
+        foreach ($data as $key => $val) {
+            $envContent = preg_replace("/^" . $key . "\s*=\s*(.*?)$/m", $key . "=" . $val, $envContent);
+        }
+        file_put_contents($envPath, $envContent);
+        return true;
+    }
+}
+
+$array = getopt('', ['port:']);
+if (isset($array['port'])) {
+    $loader = new wookteamLoader();
+    $loader->modifyEnv([
+        'APP_PORT' => $array['port']
+    ]);
+}
+

+ 2 - 1
package.json

@@ -16,6 +16,7 @@
         "cross-env": "^7.0.2",
         "css-loader": "^0.28.7",
         "jquery": "^3.5.1",
+        "jspdf": "^1.5.3",
         "laravel-mix": "^2.0",
         "lodash": "^4.17.15",
         "stylus": "^0.54.7",
@@ -30,7 +31,7 @@
         "vuedraggable": "^2.23.2",
         "vue-clipboard2": "^0.3.1",
         "vue-emoji-picker": "^1.0.1",
-        "vue-kityminder-gg": "^1.2.3",
+        "vue-kityminder-gg": "^1.3.1",
         "x-data-spreadsheet": "^1.1.2"
     }
 }

+ 3 - 3
resources/assets/js/main/components/docs/minder/index.js

@@ -1,5 +1,5 @@
-import 'vue-kityminder-gg/static/kity'
-import 'vue-kityminder-gg/static/kityminder-core'
+import './static/kity'
+import './static/kityminder.core.min'
 import "hotboxkit/less/hotbox.less"
 import Editor from './minder'
 
@@ -17,4 +17,4 @@ const install = function (Vue, opts = {}) {
 if (typeof window !== 'undefined' && window.Vue) {
     install(window.Vue);
 }
-export default Object.assign(MindEditor, {install});
+export default Object.assign(MindEditor, {install});   // eslint-disable-line no-undef

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 8574 - 0
resources/assets/js/main/components/docs/minder/static/kity.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 10 - 0
resources/assets/js/main/components/docs/minder/static/kityminder.core.min.js