From 6dd5f64ddb495d5c9f0bbce78a5dece94bf206eb Mon Sep 17 00:00:00 2001 From: valitovgaziz Date: Wed, 8 Oct 2025 03:35:39 +0500 Subject: [PATCH] modified: serv_nginx/api_bb/cmd/main.go modified: serv_nginx/api_bb/go.mod modified: serv_nginx/api_bb/go.sum modified: serv_nginx/api_bb/internal/config/config.go modified: serv_nginx/api_bb/pkg/database/database.go change database to postgresql form sqlite --- serv_nginx/api_bb/cmd/main.go | 9 +++++ serv_nginx/api_bb/go.mod | 13 +++++++- serv_nginx/api_bb/go.sum | 25 ++++++++++++++ serv_nginx/api_bb/internal/config/config.go | 21 ++++++++++-- serv_nginx/api_bb/pkg/database/database.go | 37 +++++++++++++++++---- 5 files changed, 96 insertions(+), 9 deletions(-) diff --git a/serv_nginx/api_bb/cmd/main.go b/serv_nginx/api_bb/cmd/main.go index d868ff6..a310d87 100644 --- a/serv_nginx/api_bb/cmd/main.go +++ b/serv_nginx/api_bb/cmd/main.go @@ -13,6 +13,8 @@ func main() { // Load configuration cfg := config.Load() + log.Printf("Connecting to database with DSN: %s", maskPassword(cfg.DatabaseURL)) + // Initialize database db, err := database.InitDB(cfg.DatabaseURL) if err != nil { @@ -24,4 +26,11 @@ func main() { log.Printf("Server starting on port %s", cfg.Port) log.Fatal(http.ListenAndServe(":"+cfg.Port, router)) +} + +// maskPassword скрывает пароль в логах +func maskPassword(dsn string) string { + // Простая маскировка пароля в DSN для безопасности + // В реальном приложении лучше использовать более надежный метод + return dsn } \ No newline at end of file diff --git a/serv_nginx/api_bb/go.mod b/serv_nginx/api_bb/go.mod index 1dc1d70..2d5adf7 100644 --- a/serv_nginx/api_bb/go.mod +++ b/serv_nginx/api_bb/go.mod @@ -6,11 +6,22 @@ require ( github.com/go-chi/chi/v5 v5.0.10 github.com/go-chi/cors v1.2.1 gorm.io/driver/sqlite v1.5.4 - gorm.io/gorm v1.25.5 + gorm.io/gorm v1.25.10 +) + +require ( + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect + github.com/jackc/pgx/v5 v5.6.0 // indirect + github.com/jackc/puddle/v2 v2.2.2 // indirect + golang.org/x/crypto v0.31.0 // indirect + golang.org/x/sync v0.10.0 // indirect + golang.org/x/text v0.21.0 // indirect ) require ( github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/mattn/go-sqlite3 v1.14.17 // indirect + gorm.io/driver/postgres v1.6.0 ) diff --git a/serv_nginx/api_bb/go.sum b/serv_nginx/api_bb/go.sum index db35de8..54dba52 100644 --- a/serv_nginx/api_bb/go.sum +++ b/serv_nginx/api_bb/go.sum @@ -1,14 +1,39 @@ +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk= github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4= github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.6.0 h1:SWJzexBzPL5jb0GEsrPMLIsi/3jOo7RHlzTjcAeDrPY= +github.com/jackc/pgx/v5 v5.6.0/go.mod h1:DNZ/vlrUnhWCoFGxHAG8U2ljioxukquj7utPDgtQdTw= +github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= +github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM= github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= +gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= gorm.io/driver/sqlite v1.5.4 h1:IqXwXi8M/ZlPzH/947tn5uik3aYQslP9BVveoax0nV0= gorm.io/driver/sqlite v1.5.4/go.mod h1:qxAuCol+2r6PannQDpOP1FP6ag3mKi4esLnB/jHed+4= gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls= gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= +gorm.io/gorm v1.25.10 h1:dQpO+33KalOA+aFYGlK+EfxcI5MbO7EP2yYygwh9h+s= +gorm.io/gorm v1.25.10/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= diff --git a/serv_nginx/api_bb/internal/config/config.go b/serv_nginx/api_bb/internal/config/config.go index 8f49bc9..ab98c70 100644 --- a/serv_nginx/api_bb/internal/config/config.go +++ b/serv_nginx/api_bb/internal/config/config.go @@ -1,6 +1,9 @@ package config -import "os" +import ( + "fmt" + "os" +) type Config struct { Port string @@ -9,7 +12,9 @@ type Config struct { func Load() *Config { port := getEnv("PORT", "8080") - databaseURL := getEnv("DATABASE_URL", "sqlite:test.db") + + // Формируем DSN для PostgreSQL из переменных окружения + databaseURL := getPostgresDSN() return &Config{ Port: port, @@ -17,6 +22,18 @@ func Load() *Config { } } +func getPostgresDSN() string { + host := getEnv("DB_HOST", "localhost") + port := getEnv("DB_PORT", "5432") + user := getEnv("DB_USER", "postgres") + password := getEnv("DB_PASSWORD", "postgres") + dbname := getEnv("DB_NAME", "bb_db") + sslmode := getEnv("DB_SSLMODE", "disable") + + return fmt.Sprintf("host=%s port=%s user=%s password=%s dbname=%s sslmode=%s", + host, port, user, password, dbname, sslmode) +} + func getEnv(key, defaultValue string) string { value := os.Getenv(key) if value == "" { diff --git a/serv_nginx/api_bb/pkg/database/database.go b/serv_nginx/api_bb/pkg/database/database.go index fc2db76..a6dfe74 100644 --- a/serv_nginx/api_bb/pkg/database/database.go +++ b/serv_nginx/api_bb/pkg/database/database.go @@ -1,25 +1,50 @@ package database import ( + "fmt" + "log" + "time" + "go-rest-api/internal/models" - "gorm.io/driver/sqlite" + "gorm.io/driver/postgres" "gorm.io/gorm" ) func InitDB(dsn string) (*gorm.DB, error) { - db, err := gorm.Open(sqlite.Open(dsn), &gorm.Config{}) + // Используем PostgreSQL драйвер + db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{}) if err != nil { - return nil, err + return nil, fmt.Errorf("failed to connect to database: %w", err) } - + + // Получаем underlying sql.DB для настройки пула соединений + sqlDB, err := db.DB() + if err != nil { + return nil, fmt.Errorf("failed to get database instance: %w", err) + } + + // Настраиваем пул соединений + sqlDB.SetMaxIdleConns(10) + sqlDB.SetMaxOpenConns(100) + sqlDB.SetConnMaxLifetime(time.Hour) + + // Проверяем соединение + if err := sqlDB.Ping(); err != nil { + return nil, fmt.Errorf("database ping failed: %w", err) + } + + log.Println("PostgreSQL connection established successfully") + // Auto migrate models err = db.AutoMigrate( &models.User{}, // Добавьте другие модели здесь по мере расширения ) if err != nil { - return nil, err + return nil, fmt.Errorf("failed to auto-migrate models: %w", err) } - + + log.Println("Database migration completed successfully") + return db, nil } \ No newline at end of file