From 1db45238856fcf338f73114ba0ae403cd0a0e57a Mon Sep 17 00:00:00 2001
From: ziming <zi__mm@163.com>
Date: Wed, 26 Mar 2025 10:37:41 +0800
Subject: [PATCH] 300

---
 deploy.sh             |  2 +-
 internal/data/gorm.go | 21 ++++++---------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index a571786..c7af2f8 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -23,7 +23,7 @@ docker container prune -f
 docker run -itd --name "voucher" --restart=always \
            -p 13000:13000 \
            -v /var/www/cert:/app/cert \
-            registry.cn-chengdu.aliyuncs.com/lsxdjr/voucher-pre:5b85eb95 \
+            registry.cn-chengdu.aliyuncs.com/lsxdjr/voucher-pre:29078f70 \
             ./server -nacosIp "172.16.0.239" -nacosPort 8848 -nacosSpace "pre" -nacosUsername "nacos" -nacosPassword "nacos"
 
 
diff --git a/internal/data/gorm.go b/internal/data/gorm.go
index 1bb161f..ed7dfe9 100644
--- a/internal/data/gorm.go
+++ b/internal/data/gorm.go
@@ -1,12 +1,10 @@
 package data
 
 import (
-	"database/sql"
 	"fmt"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
-	"time"
 	"voucher/internal/conf"
 )
 
@@ -25,14 +23,10 @@ func NewGormDb(c *conf.Bootstrap) (*GormDb, func()) {
 }
 
 func db(data *conf.Data_Database) (*gorm.DB, func()) {
-	mysqlConn, err := sql.Open(data.Driver, data.Source)
+	//mysqlConn, err := sql.Open(data.Driver, data.Source)
 
 	gormDB, err := gorm.Open(
-		mysql.New(
-			mysql.Config{
-				Conn: mysqlConn,
-			},
-		),
+		mysql.Open(data.Driver),
 		&gorm.Config{
 			Logger: logger.Default.LogMode(logger.Info),
 		},
@@ -50,17 +44,14 @@ func db(data *conf.Data_Database) (*gorm.DB, func()) {
 	//sqlDB.SetMaxIdleConns(int(data.MaxIdle))
 	sqlDB.SetMaxIdleConns(1000)
 	//sqlDB.SetMaxOpenConns(int(data.MaxOpen))
-	sqlDB.SetMaxOpenConns(3500)
-	sqlDB.SetConnMaxLifetime(1 * time.Hour)
-	sqlDB.SetConnMaxIdleTime(15 * time.Minute)
+	sqlDB.SetMaxOpenConns(1000)
+	//sqlDB.SetConnMaxLifetime(1 * time.Hour)
+	//sqlDB.SetConnMaxIdleTime(15 * time.Minute)
 
 	return gormDB, func() {
 
-		if mysqlConn != nil {
+		if gormDB != nil {
 			fmt.Println("关闭 db")
-			if err := mysqlConn.Close(); err != nil {
-				fmt.Printf("关闭 db 失败：%v", err)
-			}
 		}
 
 	}