300
This commit is contained in:
parent
29078f7003
commit
1db4523885
|
|
@ -23,7 +23,7 @@ docker container prune -f
|
||||||
docker run -itd --name "voucher" --restart=always \
|
docker run -itd --name "voucher" --restart=always \
|
||||||
-p 13000:13000 \
|
-p 13000:13000 \
|
||||||
-v /var/www/cert:/app/cert \
|
-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"
|
./server -nacosIp "172.16.0.239" -nacosPort 8848 -nacosSpace "pre" -nacosUsername "nacos" -nacosPassword "nacos"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,10 @@
|
||||||
package data
|
package data
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"database/sql"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"gorm.io/driver/mysql"
|
"gorm.io/driver/mysql"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
"gorm.io/gorm/logger"
|
"gorm.io/gorm/logger"
|
||||||
"time"
|
|
||||||
"voucher/internal/conf"
|
"voucher/internal/conf"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -25,14 +23,10 @@ func NewGormDb(c *conf.Bootstrap) (*GormDb, func()) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func db(data *conf.Data_Database) (*gorm.DB, 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(
|
gormDB, err := gorm.Open(
|
||||||
mysql.New(
|
mysql.Open(data.Driver),
|
||||||
mysql.Config{
|
|
||||||
Conn: mysqlConn,
|
|
||||||
},
|
|
||||||
),
|
|
||||||
&gorm.Config{
|
&gorm.Config{
|
||||||
Logger: logger.Default.LogMode(logger.Info),
|
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(int(data.MaxIdle))
|
||||||
sqlDB.SetMaxIdleConns(1000)
|
sqlDB.SetMaxIdleConns(1000)
|
||||||
//sqlDB.SetMaxOpenConns(int(data.MaxOpen))
|
//sqlDB.SetMaxOpenConns(int(data.MaxOpen))
|
||||||
sqlDB.SetMaxOpenConns(3500)
|
sqlDB.SetMaxOpenConns(1000)
|
||||||
sqlDB.SetConnMaxLifetime(1 * time.Hour)
|
//sqlDB.SetConnMaxLifetime(1 * time.Hour)
|
||||||
sqlDB.SetConnMaxIdleTime(15 * time.Minute)
|
//sqlDB.SetConnMaxIdleTime(15 * time.Minute)
|
||||||
|
|
||||||
return gormDB, func() {
|
return gormDB, func() {
|
||||||
|
|
||||||
if mysqlConn != nil {
|
if gormDB != nil {
|
||||||
fmt.Println("关闭 db")
|
fmt.Println("关闭 db")
|
||||||
if err := mysqlConn.Close(); err != nil {
|
|
||||||
fmt.Printf("关闭 db 失败:%v", err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue