From 3f8ef1823382da7080711e596ee11219c4ac3d89 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期六, 19 八月 2023 20:40:13 +0800 Subject: [PATCH] 去掉mysql 保 --- /dev/null | 57 ---------------------------- conf/config.go | 5 -- 2 files changed, 0 insertions(+), 62 deletions(-) diff --git a/conf/config.go b/conf/config.go index cdd7133..4e9f6b0 100644 --- a/conf/config.go +++ b/conf/config.go @@ -3,7 +3,6 @@ import ( "apsClient/pkg/convertx" "apsClient/pkg/logx" - "apsClient/pkg/mysqlx" "apsClient/pkg/redisx" "apsClient/pkg/sqlitex" "github.com/spf13/viper" @@ -83,9 +82,6 @@ Log logx.Conf // mysql閰嶇疆 - Mysql mysqlx.Conf - - // mysql閰嶇疆 Sqlite sqlitex.Conf // redis閰嶇疆 @@ -142,7 +138,6 @@ log.Println("......................................................") log.Printf(" System: %+v", Conf.System) log.Printf(" Log: %+v", Conf.Log) - log.Printf(" Mysql: %+v", Conf.Mysql) log.Printf(" etcd: %+v", Conf.Etcd) log.Printf(" rancher: %+v", Conf.Rancher) log.Printf(" k8s: %+v", Conf.K8s) diff --git a/pkg/mysqlx/mysqlx.go b/pkg/mysqlx/mysqlx.go deleted file mode 100644 index 2ef373d..0000000 --- a/pkg/mysqlx/mysqlx.go +++ /dev/null @@ -1,57 +0,0 @@ -package mysqlx - -import ( - "go.uber.org/zap" - "gorm.io/driver/mysql" - "gorm.io/gorm" - "gorm.io/gorm/logger" - "gorm.io/gorm/schema" - "moul.io/zapgorm2" - "time" -) - -type Conf struct { - LogMode bool - MaxIdleCon int64 - MaxOpenCon int64 - ConnMaxLifeTimeSecond int64 - ConnMaxIdleTimeSecond int64 - Dsn string - Host string -} - -var openDb *gorm.DB - -func Init(conf *Conf, log *zap.Logger) error { - gConfig := &gorm.Config{ - PrepareStmt: true, - NamingStrategy: schema.NamingStrategy{ - TablePrefix: "", - SingularTable: true, - }, - DisableForeignKeyConstraintWhenMigrating: true, - } - dbLogger := zapgorm2.New(log).LogMode(logger.Info) - if !conf.LogMode { - dbLogger = dbLogger.LogMode(logger.Silent) - } - gConfig.Logger = dbLogger - db, err := gorm.Open(mysql.Open(conf.Dsn), gConfig) - if err != nil { - return err - } - sqlDb, err := db.DB() - if err != nil { - return err - } - sqlDb.SetMaxIdleConns(int(conf.MaxIdleCon)) - sqlDb.SetMaxOpenConns(int(conf.MaxOpenCon)) - sqlDb.SetConnMaxLifetime(time.Duration(conf.ConnMaxLifeTimeSecond) * time.Second) - sqlDb.SetConnMaxIdleTime(time.Duration(conf.ConnMaxIdleTimeSecond) * time.Second) - openDb = db - return nil -} - -func GetDB() *gorm.DB { - return openDb -} -- Gitblit v1.8.0