diff --git a/README.md b/README.md index 8eb37bb..a6ad857 100644 --- a/README.md +++ b/README.md @@ -61,8 +61,8 @@ ssh - 微信群 - + + +- 微信号(如果群失效,请添加微信,备注"加入next-terminal交流群") -如果群失效,请添加微信,备注"加入next-terminal交流群" - - \ No newline at end of file + \ No newline at end of file diff --git a/config.yml b/config.yml index 62aa885..86c75f5 100644 --- a/config.yml +++ b/config.yml @@ -8,4 +8,4 @@ mysql: sqlite: file: 'next-terminal.db' server: - addr: 0.0.0.0:8088 \ No newline at end of file + addr: 0.0.0.0:8089 \ No newline at end of file diff --git a/docs/install-naive.MD b/docs/install-naive.MD index a4453e1..9514498 100644 --- a/docs/install-naive.MD +++ b/docs/install-naive.MD @@ -96,5 +96,61 @@ EOF /etc/init.d/guacd start ``` -### 安装 Next Terminal +### 安装字体(SSH使用) +安装字体管理软件 +```shell +yum install -y fontconfig mkfontscale +``` + +下载字体文件并移动到` /usr/share/fonts/`目录下 +```shell +cd /usr/share/fonts/ +wget https://raw.githubusercontent.com/dushixiang/next-terminal/master/web/src/fonts/Menlo-Regular-1.ttf +``` + +更新字体 +```shell +mkfontscale +mkfontdir +fc-cache +``` +### 安装 Next Terminal +建立next-terminal目录 +```shell +mkdir ~/next-terminal & cd ~/next-terminal +``` + +下载 +```shell +wget https://github.com/dushixiang/next-terminal/releases/download/v0.0.2/next-terminal.tgz +``` + +解压 +```shell +tar -xvf next-terminal.tgz +cd next-terminal +``` + +修改配置文件`config.yml` +```shell +db: sqlite +# 当db为sqlite时mysql的配置无效 +#mysql: +# hostname: 172.16.101.32 +# port: 3306 +# username: root +# password: mysql +# database: next-terminal + +# 当db为mysql时sqlite的配置无效 +sqlite: + file: 'next-terminal.db' +server: + addr: 0.0.0.0:8088 +``` + +启动 +```shell +./next-terminal +``` \ No newline at end of file diff --git a/pkg/config/config.go b/pkg/config/config.go index 311a5cc..3dd17d4 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -48,7 +48,7 @@ func SetupConfig() (*Config, error) { pflag.String("mysql.password", "mysql", "mysql password") pflag.String("mysql.database", "next_terminal", "mysql database") - pflag.String("server.addr", "0.0.0.0:8088", "server listen addr") + pflag.String("server.addr", "", "server listen addr") pflag.Parse() _ = viper.BindPFlags(pflag.CommandLine) diff --git a/screenshot/wx1.jpg b/screenshot/wx1.jpg deleted file mode 100644 index cde1d72..0000000 Binary files a/screenshot/wx1.jpg and /dev/null differ diff --git a/screenshot/wx1.png b/screenshot/wx1.png new file mode 100644 index 0000000..a198024 Binary files /dev/null and b/screenshot/wx1.png differ diff --git a/screenshot/wx2.jpg b/screenshot/wx2.jpg deleted file mode 100644 index f147ab0..0000000 Binary files a/screenshot/wx2.jpg and /dev/null differ diff --git a/screenshot/wx2.png b/screenshot/wx2.png new file mode 100644 index 0000000..3c7bb89 Binary files /dev/null and b/screenshot/wx2.png differ