From 5b348ff68b1d05687e03ac52187595a0eb9b624f Mon Sep 17 00:00:00 2001
From: engigu <sayheya@qq.com>
Date: Tue, 2 Jan 2024 22:19:12 +0800
Subject: [PATCH] fix: add mysql connect port

---
 conf/app.example.ini   | 3 ++-
 models/models.go       | 6 ++++--
 pkg/setting/setting.go | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/conf/app.example.ini b/conf/app.example.ini
index dde735c..3363b9c 100644
--- a/conf/app.example.ini
+++ b/conf/app.example.ini
@@ -9,7 +9,7 @@ HttpPort = 8000
 ReadTimeout = 60
 WriteTimeout = 60
 ; use embed html static file
-EmbedHtml = disable
+; EmbedHtml = disable
 
 [database]
 Type = mysql
@@ -17,4 +17,5 @@ User = root
 Password = password
 Host = 123.1.1.1
 Name = db_name
+Port = 3306
 TablePrefix = message_
diff --git a/models/models.go b/models/models.go
index c46378b..2e1618d 100644
--- a/models/models.go
+++ b/models/models.go
@@ -34,11 +34,13 @@ type UUIDModel struct {
 // Setup initializes the database instance
 func Setup() {
 	var err error
-	db, err = gorm.Open(setting.DatabaseSetting.Type, fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local",
+	connStr := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Local",
 		setting.DatabaseSetting.User,
 		setting.DatabaseSetting.Password,
 		setting.DatabaseSetting.Host,
-		setting.DatabaseSetting.Name))
+		setting.DatabaseSetting.Port,
+		setting.DatabaseSetting.Name)
+	db, err = gorm.Open(setting.DatabaseSetting.Type, connStr)
 
 	if err != nil {
 		log.Fatalf("models.Setup err: %v", err)
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 6bac521..86bae91 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -31,6 +31,7 @@ type Database struct {
 	User        string
 	Password    string
 	Host        string
+	Port        int
 	Name        string
 	TablePrefix string
 }