diff --git a/main.go b/main.go index 65deff6..7ee45c9 100644 --- a/main.go +++ b/main.go @@ -3,6 +3,7 @@ package main import ( "bot/src/controllers" "bot/src/handlers" + "bot/src/models" "log" "os" "time" @@ -11,7 +12,7 @@ import ( "gopkg.in/yaml.v3" ) -func config() controllers.Config { +func config() models.Config { file, err := os.Open("cfg.yml") if err != nil { log.Fatal(err) @@ -19,7 +20,7 @@ func config() controllers.Config { defer file.Close() // unmarshal the YAML data into a struct - var config controllers.Config + var config models.Config err = yaml.NewDecoder(file).Decode(&config) if err != nil { log.Fatal(err) diff --git a/src/controllers/dataController.go b/src/controllers/dataController.go index 9480502..bb15859 100644 --- a/src/controllers/dataController.go +++ b/src/controllers/dataController.go @@ -11,17 +11,9 @@ import ( _ "github.com/go-sql-driver/mysql" ) -type Config struct { - Token string `yaml:"token"` - UserName string `yaml:"user_name"` - Password string `yaml:"password"` - HostName string `yaml:"host_name"` - DbName string `yaml:"db_name"` -} - type DataController struct{ DB *sql.DB } -func NewDB(config Config) *DataController { +func NewDB(config models.Config) *DataController { dbaddr := fmt.Sprintf("%s:%s@tcp(%s)/%s", config.UserName, config.Password, config.HostName, config.DbName) db, err := sql.Open("mysql", dbaddr) diff --git a/src/models/config.go b/src/models/config.go new file mode 100644 index 0000000..8b902c3 --- /dev/null +++ b/src/models/config.go @@ -0,0 +1,9 @@ +package models + +type Config struct { + Token string `yaml:"token"` + UserName string `yaml:"user_name"` + Password string `yaml:"password"` + HostName string `yaml:"host_name"` + DbName string `yaml:"db_name"` +}