diff --git a/docs/install-docker.md b/docs/install-docker.md index 71c5e7e..5d1d8de 100644 --- a/docs/install-docker.md +++ b/docs/install-docker.md @@ -48,10 +48,51 @@ docker run -d \ --restart always dushixiang/next-terminal:latest ``` +或者使用docker-compose构建 + +示例: + +1. 在root目录下创建文件夹 `next-terminal` +2. 在`/root/next-terminal`文件夹下创建`docker-compose.yml`文件 + + ```yaml + version: '3.3' + services: + mysql: + image: mysql:8.0 + environment: + MYSQL_DATABASE: next-terminal + MYSQL_USER: next-terminal + MYSQL_PASSWORD: next-terminal + MYSQL_ROOT_PASSWORD: next-terminal + ports: + - "3306:3306" + next-terminal: + image: "dushixiang/next-terminal:latest" + environment: + DB: "mysql" + MYSQL_HOSTNAME: "mysql" + MYSQL_PORT: 3306 + MYSQL_USERNAME: "next-terminal" + MYSQL_PASSWORD: "next-terminal" + MYSQL_DATABASE: "next-terminal" + ports: + - "8088:8088" + volumes: + - /root/next-terminal/drive:/usr/local/next-terminal/drive + - /root/next-terminal/recording:/usr/local/next-terminal/recording + depends_on: + - mysql + ``` + +3. 在`/root/next-terminal`文件夹下执行命令`docker-compose up` + + ### 注意事项 ⚠️ 1. docker连接宿主机器上的`mysql`时连接地址不是`127.0.0.1`,请使用`ipconfig`或`ifconfig`确认宿主机器的IP。 2. 使用其他容器内部的`mysql`时请使用`--link `,环境变量参数为`-e MYSQL_HOSTNAME=` +3. 使用独立数据库的需要手动创建数据库,使用docker-compose不需要。 ## 环境变量 diff --git a/docs/install-naive.md b/docs/install-naive.md index 087fe84..27dfb0e 100644 --- a/docs/install-naive.md +++ b/docs/install-naive.md @@ -22,9 +22,9 @@ sudo apt-get install libcairo2-dev libjpeg62-turbo-dev libpng-dev libtool-bin li 下载&解压&configure ```shell -wget https://mirror.bit.edu.cn/apache/guacamole/1.2.0/source/guacamole-server-1.2.0.tar.gz -tar -xzf guacamole-server-1.2.0.tar.gz -cd guacamole-server-1.2.0 +wget https://mirror.bit.edu.cn/apache/guacamole/1.3.0/source/guacamole-server-1.3.0.tar.gz +tar -xzf guacamole-server-1.3.0.tar.gz +cd guacamole-server-1.3.0 ./configure --with-init-dir=/etc/init.d ``` @@ -32,7 +32,7 @@ cd guacamole-server-1.2.0 ```shell ------------------------------------------------ -guacamole-server version 1.2.0 +guacamole-server version 1.3.0 ------------------------------------------------ Library status: diff --git a/web/src/components/access/FileSystem.js b/web/src/components/access/FileSystem.js index 04c3d41..7c6eca5 100644 --- a/web/src/components/access/FileSystem.js +++ b/web/src/components/access/FileSystem.js @@ -355,8 +355,6 @@ class FileSystem extends Component { this.setState({selectedRowKeys}); }, }; - const hasSelected = selectedRowKeys.length > 0; - return (
diff --git a/web/src/components/asset/AssetModal.js b/web/src/components/asset/AssetModal.js index 2c5535c..c92d16e 100644 --- a/web/src/components/asset/AssetModal.js +++ b/web/src/components/asset/AssetModal.js @@ -1,23 +1,10 @@ import React, {useState} from 'react'; -import { - Col, - Collapse, - Form, - Input, - InputNumber, - Modal, - Radio, - Row, - Select, - Switch, - Tooltip, - Typography -} from "antd/lib/index"; +import {Col, Collapse, Form, Input, InputNumber, Modal, Radio, Row, Select, Tooltip, Typography} from "antd/lib/index"; import {ExclamationCircleOutlined} from "@ant-design/icons"; const {TextArea} = Input; const {Option} = Select; -const {Text, Title} = Typography; +const {Text} = Typography; const {Panel} = Collapse; // 子级页面 @@ -38,10 +25,7 @@ const formLayout = { labelCol: {span: 6}, wrapperCol: {span: 18}, }; -const RDPFormItemLayout = { - labelCol: {span: 12}, - wrapperCol: {span: 12}, -}; + const TELENETFormItemLayout = { labelCol: {span: 8}, wrapperCol: {span: 16},