refactor:

- 优化 postgresql 的配置文件
- dsn 优化
- gorm logger 代码优化
- 优化 注册表 函数名
- 更新 go.mod
This commit is contained in:
SliverHorn
2021-11-15 23:50:28 +08:00
parent 1744c0b44d
commit f19e719cbb
10 changed files with 128 additions and 244 deletions

View File

@@ -2,30 +2,24 @@ package initialize
import (
"github.com/flipped-aurora/gin-vue-admin/server/global"
"github.com/flipped-aurora/gin-vue-admin/server/initialize/internal"
"gorm.io/driver/postgres"
"gorm.io/gorm"
)
//@author: SliverHorn
//@function: GormMysql
//@description: 初始化Mysql数据库
//@return: *gorm.DB
// GormPgSql 初始化 Postgresql 数据库
// Author piexlmax
// Author SliverHorn
func GormPgSql() *gorm.DB {
p := global.GVA_CONFIG.Pgsql
if p.Dbname == "" {
return nil
}
dsn := "host=" + p.Path + " user=" + p.Username + " password=" + p.Password + " dbname=" + p.Dbname + " port=" + p.Port + " " + p.Config
pgsqlConfig := postgres.Config{
DSN: dsn, // DSN data source name
DSN: p.Dsn(), // DSN data source name
PreferSimpleProtocol: false,
}
if db, err := gorm.Open(postgres.New(pgsqlConfig), gormConfig()); err != nil {
//global.GVA_LOG.Error("MySQL启动异常", zap.Any("err", err))
//os.Exit(0)
//return nil
if db, err := gorm.Open(postgres.New(pgsqlConfig), internal.Gorm.Config()); err != nil {
return nil
} else {
sqlDB, _ := db.DB()