From cd880e3854920b1488b40a731f55da2dfe4fd7ec Mon Sep 17 00:00:00 2001 From: ahdan15 Date: Mon, 19 May 2025 15:34:12 +0700 Subject: [PATCH] env baru --- .env | 8 +------- docker-compose.yml | 8 +++++++- internal/database/database.go | 13 ------------- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/.env b/.env index 69874fb..34560f9 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -PORT=8086 +PORT=8080 SATUDATA_HOST=10.10.123.165 SATUDATA_USERNAME=stim @@ -6,12 +6,6 @@ SATUDATA_PASSWORD=stim*RS54 SATUDATA_NAME=satu_db SATUDATA_PORT=5000 -SIMRS_HOST=10.10.123.160 -SIMRS_USERNAME=simrs -SIMRS_PASSWORD=simrs.rssa -SIMRS_NAME=simrs -SIMRS_PORT=5000 - SIMRS_STAG_HOST=10.10.123.223 SIMRS_STAG_USER=simtest SIMRS_STAG_PASS=12345 diff --git a/docker-compose.yml b/docker-compose.yml index d6d4663..b6ae3e4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: container_name: api-retribusi restart: always ports: - - 8086:8086 + - 8080:8080 volumes: - .:/app - /etc/localtime:/etc/localtime:ro @@ -14,6 +14,12 @@ services: environment: # TIMEZONE - TZ=Asia/Jakarta + # DATABASE SIMRS V3.0 + - SIMRS_STAG_HOST=10.10.123.223 + - SIMRS_STAG_PORT=5432 + - SIMRS_STAG_NAME=simrsbackup + - SIMRS_STAG_USER=simtest + - SIMRS_STAG_PASS=12345 # DATABASE SATU DATA - SATUDATA_HOST=10.10.123.165 - SATUDATA_USER=stim diff --git a/internal/database/database.go b/internal/database/database.go index 6a66765..bd25899 100644 --- a/internal/database/database.go +++ b/internal/database/database.go @@ -27,11 +27,6 @@ type service struct { } var ( - hostSimrs = os.Getenv("SIMRS_STAG_HOST") - userNameSimrs = os.Getenv("SIMRS_STAG_USER") - passwordSimrs = os.Getenv("SIMRS_STAG_PASS") - dbNameSimrs = os.Getenv("SIMRS_STAG_NAME") - portSimrs = os.Getenv("SIMRS_STAG_PORT") hostSatudata = os.Getenv("SATUDATA_HOST") userNameSatudata = os.Getenv("SATUDATA_USER") passwordSatudata = os.Getenv("SATUDATA_PASS") @@ -45,14 +40,7 @@ func New() Service { if dbInstance != nil { return dbInstance } - simrs := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%s sslmode=disable TimeZone=Asia/Jakarta", hostSimrs, userNameSimrs, passwordSimrs, dbNameSimrs, portSimrs) - SimrsDB, err := gorm.Open(postgres.Open(simrs), &gorm.Config{}) - if err != nil { - log.Fatal("Failed to connect to SIM database: ", err) - } else { - log.Println("Successfully connected to the database") - } satudata := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%s sslmode=disable TimeZone=Asia/Jakarta", hostSatudata, userNameSatudata, passwordSatudata, dbNameSatudata, portSatudata) SatudataDB, err := gorm.Open(postgres.Open(satudata), &gorm.Config{}) @@ -62,7 +50,6 @@ func New() Service { log.Println("Successfully connected to the database") } dbInstance = &service{ - simrsDB: SimrsDB, satuDataDB: SatudataDB, } return dbInstance