Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	web/src/components/Login.js
#	web/src/components/user/LayoutHeader.js

.github/workflows/golangci-lint.yml

@@ -0,0 +1,22 @@
+name: golangci-lint
+on:
+  push:
+    tags:
+      - v*
+    branches:
+      - master
+      - be-*
+      - dev
+  pull_request:
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
+          version: latest
+          args: --timeout=5m

.gitignore

@@ -4,4 +4,26 @@ web/build
 *.db
 .DS_Store
 .eslintcache
-.env
+.env
+
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# ignore ide config
+.idea
+.vscode
+
+# vim
+*.swp
+
+
+# playground
+playground/data
+playground/drive
+playground/recording
+
+/log

.golangci.yml

@@ -0,0 +1,23 @@
+linters-settings:
+  goimports:
+    local-prefixes: next-terminal
+
+linters:
+  disable-all: true
+  enable:
+    - deadcode
+    - errcheck
+    - gofmt
+    - goimports
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck
+
+run:
+  skip-files:
+    - test_ssh.go

config.yml

@@ -2,10 +2,10 @@ debug: true
 demo: false
 db: mysql
 mysql:
-  hostname: 172.16.101.32
+  hostname: localhost
   port: 3306
-  username: root
-  password: mysql
+  username: next-terminal
+  password: next-terminal
   database: next-terminal
 sqlite:
   file: 'next-terminal.db'

docs/screenshot.md

@@ -1,23 +1,69 @@
-资源占用截图
+### 资源占用
+
+未使用时资源占用非常小
 
 ![资源占用截图](../screenshot/docker_stats.png)
 
-资产管理
+### 控制面板
+
+更方便的概览系统信息
+
+![dashboard](../screenshot/dashboard.png)
+
+### 资产管理
+
+支持多种RDP、SSH、Telnet、VNC，Kubernetes等多种协议的资产
 
 ![资产](../screenshot/assets.png)
 
-rdp
+#### rdp
 
 ![rdp](../screenshot/rdp.png)
 
-vnc
+#### vnc
 
 ![vnc](../screenshot/vnc.png)
 
-ssh
+#### ssh
 
 ![ssh](../screenshot/ssh.png)
 
+### 授权凭证
+
+极为方便的复用资产认证信息
+
+![凭证](../screenshot/credential.png)
+
 批量执行命令
 
-![批量执行命令](../screenshot/command.png)
+![批量执行命令](../screenshot/command.png)
+
+### 在线监控
+
+实时监控用户的操作，并可以随时断开该会话
+
+![在线监控](../screenshot/online_session.png)
+
+### 离线回放
+
+详细的数据回放，定位任何一个可疑操作
+
+![离线回放](../screenshot/offline_session.png)
+
+### 计划任务
+
+自定义计划任务
+
+![计划任务](../screenshot/cron.png)
+
+### 访问安全
+
+黑白名单访问控制，支持ip、cidr及连续IP
+
+![访问安全](../screenshot/access.png)
+
+### 用户组授权
+
+灵活的授权策略
+
+![用户组授权](../screenshot/user_group.png)

go.mod

@@ -10,13 +10,16 @@ require (
 	github.com/labstack/echo/v4 v4.1.17
 	github.com/labstack/gommon v0.3.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
+	github.com/pkg/errors v0.9.1
 	github.com/pkg/sftp v1.12.0
 	github.com/pquerna/otp v1.3.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/pflag v1.0.3
 	github.com/spf13/viper v1.7.1
+	github.com/stretchr/testify v1.6.1
 	golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gorm.io/driver/mysql v1.0.3
 	gorm.io/driver/sqlite v1.1.4
 	gorm.io/gorm v1.20.7

go.sum

@@ -353,6 +353,8 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=