完善dockerfile构建镜像

pkg/config/config.go

@@ -1,14 +1,63 @@
 package config
 
 import (
-	"github.com/patrickmn/go-cache"
-	"gorm.io/gorm"
+	"github.com/spf13/pflag"
+	"github.com/spf13/viper"
+	"log"
 )
 
-var DB *gorm.DB
+type Config struct {
+	Server *Server
+	Mysql  *Mysql
+}
 
-var Cache *cache.Cache
+type Mysql struct {
+	Hostname string
+	Port     int
+	Username string
+	Password string
+	Database string
+}
 
-var NextTerminal *NextTerminalConfig
+type Server struct {
+	Addr string
+}
 
-var Store *TunStore
+func SetupConfig() *Config {
+
+	viper.SetConfigName("config")
+	viper.SetConfigType("yaml")
+	viper.AddConfigPath("/etc/nt/")
+	viper.AddConfigPath("$HOME/.nt")
+	viper.AddConfigPath(".")
+
+	pflag.String("mysql.hostname", "127.0.0.1", "mysql hostname")
+	pflag.Int("mysql.port", 3306, "mysql port")
+	pflag.String("mysql.username", "mysql", "mysql username")
+	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.Parse()
+	_ = viper.BindPFlags(pflag.CommandLine)
+
+	err := viper.ReadInConfig()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	var config = &Config{
+		Mysql: &Mysql{
+			Hostname: viper.GetString("mysql.hostname"),
+			Port:     viper.GetInt("mysql.port"),
+			Username: viper.GetString("mysql.username"),
+			Password: viper.GetString("mysql.password"),
+			Database: viper.GetString("mysql.database"),
+		},
+		Server: &Server{
+			Addr: viper.GetString("server.addr"),
+		},
+	}
+
+	return config
+}

pkg/config/next-terminal.go

@@ -1,31 +0,0 @@
-package config
-
-import (
-	"github.com/spf13/viper"
-	"log"
-)
-
-type NextTerminalConfig struct {
-	Dsn  string
-	Addr string
-}
-
-func SetupConfig() *NextTerminalConfig {
-
-	viper.SetConfigName("next-terminal")
-	viper.SetConfigType("yaml")
-	viper.AddConfigPath("/etc/next-terminal/")
-	viper.AddConfigPath("$HOME/.next-terminal")
-	viper.AddConfigPath(".")
-	err := viper.ReadInConfig()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	var config = &NextTerminalConfig{
-		Dsn:  viper.GetString("next-terminal.dsn"),
-		Addr: viper.GetString("next-terminal.addr"),
-	}
-
-	return config
-}

pkg/config/store.go

@@ -1,37 +0,0 @@
-package config
-
-import (
-	"github.com/pkg/sftp"
-	"next-terminal/pkg/guacd"
-	"sync"
-)
-
-type Tun struct {
-	Tun        guacd.Tunnel
-	SftpClient *sftp.Client
-}
-
-type TunStore struct {
-	m sync.Map
-}
-
-func (s *TunStore) Set(k string, v Tun) {
-	s.m.Store(k, v)
-}
-
-func (s *TunStore) Del(k string) {
-	s.m.Delete(k)
-}
-
-func (s *TunStore) Get(k string) (item Tun, ok bool) {
-	value, ok := s.m.Load(k)
-	if ok {
-		return value.(Tun), true
-	}
-	return item, false
-}
-
-func NewStore() *TunStore {
-	store := TunStore{sync.Map{}}
-	return &store
-}