Merge pull request #8 from fumeapp/feat/db-port

Define DB Port
fumeapp · Dec 21, 2023 · 5fdeaf0 · 5fdeaf0
2 parents b900173 + 3412c03
commit 5fdeaf0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/database/database.go b/database/database.go
@@ -4,6 +4,9 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
+	"log"
+	"net/http"
+
 	awsconfig "github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/credentials"
 	"github.com/fumeapp/tonic/setting"
@@ -12,19 +15,18 @@ import (
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
-	"log"
-	"net/http"
 )
 
 var Db *gorm.DB
 var Os *opensearch.Client
 
 func DSN() string {
 	return fmt.Sprintf(
-		"%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local",
+		"%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=True&loc=Local",
 		setting.Database.Username,
 		setting.Database.Password,
 		setting.Database.Host,
+		setting.Database.Port,
 		setting.Database.Database,
 	)
 }

diff --git a/setting/database.go b/setting/database.go
@@ -3,6 +3,7 @@ package setting
 type DatabaseSetting struct {
 	Connect     string
 	Host        string
+	Port        string
 	Database    string
 	Username    string
 	Password    string
@@ -17,6 +18,7 @@ func DatabaseSetup() *DatabaseSetting {
 	Database.Connect = env("DB_CONNECT", "false")
 	Database.Logging = env("DB_LOGGING", "false")
 	Database.Host = env("DB_HOST", "localhost")
+	Database.Port = env("DB_PORT", "3306")
 	Database.Database = env("DB_DATABASE", "tonic")
 	Database.Username = env("DB_USERNAME", "root")
 	Database.Password = env("DB_PASSWORD", "")