From 610868d5c8523e49333f36150c520898ff20b27c Mon Sep 17 00:00:00 2001 From: arch3rPro <30855883+arch3rPro@users.noreply.github.com> Date: Tue, 8 Jul 2025 21:14:26 +0800 Subject: [PATCH] feat: update Next-Terminal 2.5.5 --- apps/md/2.0.3/data.yml | 10 ---- apps/md/2.0.3/docker-compose.yml | 14 ----- .../{2.4.10 => 2.5.5}/.env.sample | 0 .../{2.4.10 => 2.5.5}/config.yaml | 0 apps/next-terminal/{2.4.10 => 2.5.5}/data.yml | 0 .../{2.4.10 => 2.5.5}/docker-compose.yml | 4 +- .../{2.4.10 => 2.5.5}/ssh/id_rsa | 0 apps/next-terminal/README.md | 32 ++--------- apps/next-terminal/latest/.env.sample | 6 +++ apps/next-terminal/latest/config.yaml | 31 +++++++++++ apps/next-terminal/latest/data.yml | 41 ++++++++++++++ apps/next-terminal/latest/docker-compose.yml | 53 +++++++++++++++++++ apps/next-terminal/latest/ssh/id_rsa | 49 +++++++++++++++++ 13 files changed, 186 insertions(+), 54 deletions(-) delete mode 100644 apps/md/2.0.3/data.yml delete mode 100644 apps/md/2.0.3/docker-compose.yml rename apps/next-terminal/{2.4.10 => 2.5.5}/.env.sample (100%) rename apps/next-terminal/{2.4.10 => 2.5.5}/config.yaml (100%) rename apps/next-terminal/{2.4.10 => 2.5.5}/data.yml (100%) rename apps/next-terminal/{2.4.10 => 2.5.5}/docker-compose.yml (94%) rename apps/next-terminal/{2.4.10 => 2.5.5}/ssh/id_rsa (100%) create mode 100644 apps/next-terminal/latest/.env.sample create mode 100755 apps/next-terminal/latest/config.yaml create mode 100644 apps/next-terminal/latest/data.yml create mode 100644 apps/next-terminal/latest/docker-compose.yml create mode 100644 apps/next-terminal/latest/ssh/id_rsa diff --git a/apps/md/2.0.3/data.yml b/apps/md/2.0.3/data.yml deleted file mode 100644 index 31e9d07..0000000 --- a/apps/md/2.0.3/data.yml +++ /dev/null @@ -1,10 +0,0 @@ -additionalProperties: - formFields: - - default: 8080 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Port - labelZh: 端口 - required: true - rule: paramPort - type: number \ No newline at end of file diff --git a/apps/md/2.0.3/docker-compose.yml b/apps/md/2.0.3/docker-compose.yml deleted file mode 100644 index 9127209..0000000 --- a/apps/md/2.0.3/docker-compose.yml +++ /dev/null @@ -1,14 +0,0 @@ -services: - md: - image: doocs/md:2.0.3 - container_name: ${CONTAINER_NAME} - restart: always - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:80 - labels: - createdBy: "Apps" -networks: - 1panel-network: - external: true diff --git a/apps/next-terminal/2.4.10/.env.sample b/apps/next-terminal/2.5.5/.env.sample similarity index 100% rename from apps/next-terminal/2.4.10/.env.sample rename to apps/next-terminal/2.5.5/.env.sample diff --git a/apps/next-terminal/2.4.10/config.yaml b/apps/next-terminal/2.5.5/config.yaml similarity index 100% rename from apps/next-terminal/2.4.10/config.yaml rename to apps/next-terminal/2.5.5/config.yaml diff --git a/apps/next-terminal/2.4.10/data.yml b/apps/next-terminal/2.5.5/data.yml similarity index 100% rename from apps/next-terminal/2.4.10/data.yml rename to apps/next-terminal/2.5.5/data.yml diff --git a/apps/next-terminal/2.4.10/docker-compose.yml b/apps/next-terminal/2.5.5/docker-compose.yml similarity index 94% rename from apps/next-terminal/2.4.10/docker-compose.yml rename to apps/next-terminal/2.5.5/docker-compose.yml index d352e09..39eb172 100644 --- a/apps/next-terminal/2.4.10/docker-compose.yml +++ b/apps/next-terminal/2.5.5/docker-compose.yml @@ -1,6 +1,6 @@ services: next-terminal: - image: dushixiang/next-terminal:v2.4.10 + image: dushixiang/next-terminal:v2.5.5 container_name: ${CONTAINER_NAME} restart: always networks: @@ -36,7 +36,7 @@ services: guacd: container_name: guacd-${CONTAINER_NAME} - image: dushixiang/guacd:1.5.5 + image: dushixiang/guacd:latest restart: always networks: - 1panel-network diff --git a/apps/next-terminal/2.4.10/ssh/id_rsa b/apps/next-terminal/2.5.5/ssh/id_rsa similarity index 100% rename from apps/next-terminal/2.4.10/ssh/id_rsa rename to apps/next-terminal/2.5.5/ssh/id_rsa diff --git a/apps/next-terminal/README.md b/apps/next-terminal/README.md index 040a9d3..8edb95c 100644 --- a/apps/next-terminal/README.md +++ b/apps/next-terminal/README.md @@ -1,7 +1,9 @@ # Next Terminal -[![Docker guacd build](https://github.com/dushixiang/next-terminal/actions/workflows/docker-guacd.yml/badge.svg)](https://github.com/dushixiang/next-terminal/actions/workflows/docker-guacd.yml) -[![Docker next-terminal build](https://github.com/dushixiang/next-terminal/actions/workflows/docker-next-terminal.yml/badge.svg)](https://github.com/dushixiang/next-terminal/actions/workflows/docker-next-terminal.yml) +Next Terminal是一个简单好用安全的开源交互审计系统，支持RDP、SSH、VNC、Telnet、Kubernetes协议。 + +![](https://github.com/dushixiang/next-terminal/raw/master/screenshots/zh/dashboard.png) +![](https://github.com/dushixiang/next-terminal/raw/master/screenshots/zh/access.png) ## 快速了解 @@ -45,29 +47,3 @@ https://next.typesafe.cn/ 账号：test 密码：test - [安装文档](https://next-terminal.typesafe.cn) 默认账号密码为 admin/admin 。 - -## 手动编译 - -1. 找一台Linux 机器或者Mac -2. 安装 go 1.18 或以上版本 -3. 安装 nodejs 16，安装 npm 或 yarn -4. 进入 web 目录 执行 yarn 或 npm install -5. 返回上级目录，也就是项目根目录，执行 sh build.sh - -## 问题反馈 - -- Issues -- 微信群 加我微信拉你进群 (请备注 next-terminal) - - - -- QQ群 938145268 -- Telegram https://t.me/next_terminal - -## 安全问题 - -如果您在使用过程中发现了安全问题，请发送邮件至 helloworld1024@foxmail.com 联系我，谢谢。 - -## License - -Next Terminal 使用 [AGPL-3.0](./LICENSE) 开源协议，请自觉遵守。 \ No newline at end of file diff --git a/apps/next-terminal/latest/.env.sample b/apps/next-terminal/latest/.env.sample new file mode 100644 index 0000000..fb20450 --- /dev/null +++ b/apps/next-terminal/latest/.env.sample @@ -0,0 +1,6 @@ +CONTAINER_NAME="next-terminal" +PANEL_APP_PORT_HTTP="40058" +PANEL_APP_PORT_SSH="40059" +DATA_PATH="./data" +SSHD_SWITCH="false" +SSH_KEY_PATH="./ssh/id_rsa" \ No newline at end of file diff --git a/apps/next-terminal/latest/config.yaml b/apps/next-terminal/latest/config.yaml new file mode 100755 index 0000000..29f487f --- /dev/null +++ b/apps/next-terminal/latest/config.yaml @@ -0,0 +1,31 @@ +database: + enabled: true + type: postgres + postgres: + hostname: postgresql + port: 5432 + username: next-terminal + password: next-terminal + database: next-terminal +log: + level: debug + filename: ./logs/nt.log + +server: + addr: "0.0.0.0:8088" + tls: + enabled: false + auto: false + cert: "" + key: "" + +app: + recording: + type: "local" + path: "/usr/local/next-terminal/data/recordings" + guacd: + drive: "/usr/local/next-terminal/data/drive" + hosts: + - hostname: guacd + port: 4822 + weight: 1 \ No newline at end of file diff --git a/apps/next-terminal/latest/data.yml b/apps/next-terminal/latest/data.yml new file mode 100644 index 0000000..83e0fa6 --- /dev/null +++ b/apps/next-terminal/latest/data.yml @@ -0,0 +1,41 @@ +additionalProperties: + formFields: + - default: 40058 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelEn: Port + labelZh: 端口 + required: true + rule: paramPort + type: number + - default: 40059 + edit: true + envKey: PANEL_APP_PORT_SSH + labelEn: SSH Server Port + labelZh: SSH Server 端口 (可选) + required: false + rule: paramPort + type: number + - default: 40060 + edit: true + envKey: PANEL_APP_PORT_PROXY_HTTP + labelEn: Proxy HTTP Port + labelZh: 资产反代 HTTP 端口 (可选) + required: false + rule: paramPort + type: number + - default: 40061 + edit: true + envKey: PANEL_APP_PORT_PROXY_HTTPS + labelEn: Proxy HTTPS Port + labelZh: 资产反代 HTTPS 端口 (申请证书必需) + required: false + rule: paramPort + type: number + - default: ./data + edit: true + envKey: DATA_PATH + labelEn: Data folder path + labelZh: 数据文件夹路径 + required: true + type: text diff --git a/apps/next-terminal/latest/docker-compose.yml b/apps/next-terminal/latest/docker-compose.yml new file mode 100644 index 0000000..0301159 --- /dev/null +++ b/apps/next-terminal/latest/docker-compose.yml @@ -0,0 +1,53 @@ +services: + next-terminal: + image: dushixiang/next-terminal:latest + container_name: ${CONTAINER_NAME} + restart: always + networks: + - 1panel-network + ports: + - "${PANEL_APP_PORT_HTTP}:8088" + - "${PANEL_APP_PORT_SSH}:2022" + - "${PANEL_APP_PORT_PROXY_HTTP}:80" + - "${PANEL_APP_PORT_PROXY_HTTPS}:443" + volumes: + - "/etc/localtime:/etc/localtime" + - "${DATA_PATH}:/usr/local/next-terminal/data" + - ./logs:/usr/local/next-terminal/logs + - ./config.yaml:/etc/next-terminal/config.yaml + depends_on: + - postgresql + - guacd + + labels: + createdBy: "Apps" + postgresql: + container_name: postgresql-${CONTAINER_NAME} + image: registry.cn-beijing.aliyuncs.com/dushixiang/postgres:16.4 + networks: + - 1panel-network + environment: + POSTGRES_DB: next-terminal + POSTGRES_USER: next-terminal + POSTGRES_PASSWORD: next-terminal + volumes: + - ./data/postgresql:/var/lib/postgresql/data + restart: always + + guacd: + container_name: guacd-${CONTAINER_NAME} + image: dushixiang/guacd:latest + restart: always + networks: + - 1panel-network + volumes: + - "${DATA_PATH}:/usr/local/next-terminal/data" + + environment: + - GUACD_LOG_LEVEL=debug + labels: + createdBy: "Apps" + +networks: + 1panel-network: + external: true \ No newline at end of file diff --git a/apps/next-terminal/latest/ssh/id_rsa b/apps/next-terminal/latest/ssh/id_rsa new file mode 100644 index 0000000..fe75755 --- /dev/null +++ b/apps/next-terminal/latest/ssh/id_rsa @@ -0,0 +1,49 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAACFwAAAAdzc2gtcn +NhAAAAAwEAAQAAAgEAqNqKouPlvUBbLv4BUSMxaZu4rFBMKLcl2MSetFAx/Ya/e5JFQ9rZ +RhMmZqx7gfj6/OQTXw9qN43k0XKy0Y9u3APtt9OZ9Y5StcmXljQhy8EQOF+MyZAEY3HpM7 +4xIV+v16z1mBrczZcFUbALVdijPAWhhMZxxhaN+EA8IfA0ByoE++w6XjvrYEOhW2qCMptL +TV6ZSUW7IOOoa/VzZBujUqgXrqiOshVy79mZi/mg5Sctp727JHr4PAw4yEqDHkLX4D97Rc +Qy8FMbmw40my6G+P22YywCdwVXlgZOq1dCuCRVAzl811nnTSLigyll3DBOilkp0RsDATUv +xCYc8UbwIrlUGDFKz8f54BN2kIgUX7OKVFOefhnpwpasZ8BjF+4A+3b5PkxQEg4SYiYWJc +RDIs9pCuSG2kX45PhbGMoWfbqU63pftM2fVtWiStMOZysvfkaLVUhJPQT3TZhiO84mkz6S +juQO2+b7Olb+rSe0naOzewvi72fFzbAOSEe4hj4Ewh38u1gYge5kOSg/SaHcYvVa2OU9Fz +iS5BCKKfcGtvkxl/HNDlNndCVw4DZHxmIkWDDa6uLI3qWn5A+AVP2D8zMTSmn/gkPxkYE5 +lkhWr4aM0/purV2JeupZzSDYa0zWL+6SuEWDL1qw9oglDm209go6jBbjEtaMDxt9YpkCcX +kAAAdQPAxkLDwMZCwAAAAHc3NoLXJzYQAAAgEAqNqKouPlvUBbLv4BUSMxaZu4rFBMKLcl +2MSetFAx/Ya/e5JFQ9rZRhMmZqx7gfj6/OQTXw9qN43k0XKy0Y9u3APtt9OZ9Y5StcmXlj +Qhy8EQOF+MyZAEY3HpM74xIV+v16z1mBrczZcFUbALVdijPAWhhMZxxhaN+EA8IfA0ByoE +++w6XjvrYEOhW2qCMptLTV6ZSUW7IOOoa/VzZBujUqgXrqiOshVy79mZi/mg5Sctp727JH +r4PAw4yEqDHkLX4D97RcQy8FMbmw40my6G+P22YywCdwVXlgZOq1dCuCRVAzl811nnTSLi +gyll3DBOilkp0RsDATUvxCYc8UbwIrlUGDFKz8f54BN2kIgUX7OKVFOefhnpwpasZ8BjF+ +4A+3b5PkxQEg4SYiYWJcRDIs9pCuSG2kX45PhbGMoWfbqU63pftM2fVtWiStMOZysvfkaL +VUhJPQT3TZhiO84mkz6SjuQO2+b7Olb+rSe0naOzewvi72fFzbAOSEe4hj4Ewh38u1gYge +5kOSg/SaHcYvVa2OU9FziS5BCKKfcGtvkxl/HNDlNndCVw4DZHxmIkWDDa6uLI3qWn5A+A +VP2D8zMTSmn/gkPxkYE5lkhWr4aM0/purV2JeupZzSDYa0zWL+6SuEWDL1qw9oglDm209g +o6jBbjEtaMDxt9YpkCcXkAAAADAQABAAACAE2riU34SrtNGSR6jpyF9brAeKg6n22zIWOe +venvYa9fBkGPPPFDf+It+OINwRo+LyWYvBhj/NXlHTYC7qJaugHWhMikOxOrDfy06FedT1 +ZsTkvAGAC3kG01/rFgcTUK0NYCp036PUsMhtPWiMBKUHvRk0SCC9+0jEV/Nqnd1fDdsUE4 +nniuU00KjvR//7fLm03Rj+0WeEdesSBH3XZVCEGDNLGQs2LTXvVZQLoUb6A471VTfvv+3K +SycoQfUkTfNnHegZPL9ip58B7Y3/Xp5wgtnHHt0oxxFqLZ7+H816HghIJhNT3SCwV+YHc4 +2bP5PIeDECsxo6YwkvJFHdcWbGqtUEDawJ+sUit0iBnByvbDRT5iMgcszekdv4FC7YhWxp +nSJCU2GOWIeFKjxcqYkIyYNjJ2+Agh7JQME7pYfeXeyqWlewLi61Xp3jzAU6exH8l/6m0w +luzKDaoyw4XR9apIGkRSbmgi7sMhCqpxgWUuOYZj4cqxOXJsaR9vgdwOpvrvMMTahIjQSc +Es2qzsqvoyqV0pAufOAgO77NgawhGpO6E8nOm2W5TFvfAQLXdjcb7drKTgeSLgfLPeVITH +0a6AYyGij6N1QkOEADH3AwapJwbV6WFb0n/n6CnAfcfZ9ZDRhHC8R14Mc+EhZ2KiwwvKdk +qrchmspx6dWEs/nLABAAABAB7tCOMMbB4KC4/e2GIQCbW1DiTQOWwpGFTjhRf8f41fU6Wg +yT5W7CN4olPUWOnCs+CtyKdCtQdhZzMxhE9Kj01S0hBCJeNQibIq8CKmzab7XvSnSRdzsT +qm7hyo7Yvo3EFeBxHTaOAQ99CcgevX+CYGibj6EXs35vqjRXZ9OEnBJ+bbMJGU5JCINeb8 +ZiC9T/TTXBgemPYcmKb+LzxgJWco8hI9W9t37OmrAagdeXo3P1KWym0rWknlxF9glOdgZe +WsxcaErNhOos6tD2Jq/WUjQdEDwoYscpm5QMwkNqWKdFa/WK60S4e/bZdK/JOV4Dbd0Ukz +pl77sLYP+TT+wMcAAAEBANIwTNTjtoRws0XMioRg1yPU9XA577ZFh0E0qVFyhOKlAaZQo/ +qElZkaqd3IAkxXtJ9T80r5mMZxJL/9PBQIWLCSkvUC91qMNyBw0W9lr5S10JAl5vG27WOt +cGFJzdWa3g9DwZuyr5bTh62zV9ET1v/vr33fGf60g8H9SMQcb2oPqqkoZHMEcgeqhrd843 +zBm7nuFkY74WaCH1n78vkazKSGKVbUxwdh9MgMRW6mYf/HkAM7nuMqcubyZ4oF3OmCEizd +NBoEjAJtQNI5dms0BPuZBoqu1av52F9IIX+PI4miI5E7i8DNImMJQozCLlG4QWBrjd6oAp +UXqBWs+gg7lQEAAAEBAM2n6Vz3tsP4Y2JP3rKHUcCA5JuuzHVuemGj18C6Xh6cdYUy7RSe +F042HBRl/3nuV4H4+lfr3Ur5yCERBdyOUeeuGfNlZhWXwwy+myYSUtT/dNGN5P8wFK/sxc +pmbqM9Sl/TlEudYwqMBZzlzquzys3UBtEmtsM8Bgdxwd+vn94a4nKkGr5X0SfE8evpZWuS +dQywRfA0aPxSwORoTmYzr6yEWQzywYUlC1Gd9hW6Fy8lYKGx9SZXnrvxsRQBQwAQbnvHGL +FbF138AwwkrKJPtedQZkAs4teFg8ggPuA3SpWFcjEJGKQYwkpMxjHmiP9AvS0t34PJOiYa +i9cQ/l2FBHkAAAAWeW91cl9lbWFpbEBleGFtcGxlLmNvbQECAwQF +-----END OPENSSH PRIVATE KEY-----