ZiHangQin/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

refactor(db):切换数据库驱动为pq，数据控制库为bun，更改Redis连接的名称。

Browse Source
This commit is contained in:
徐涛
2022-09-15 10:11:27 +08:00
parent 769882dce5
commit 4254d020b9
4 changed files with 53 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
global/db.go
View File

@@ -1,58 +1,45 @@
package global
import (
"database/sql"
"fmt"
"strings"
"time"
"electricity_bill_calc/config"
"electricity_bill_calc/logger"
// _ "github.com/lib/pq"
_ "github.com/jackc/pgx/v5/stdlib"
"xorm.io/xorm"
"xorm.io/xorm/log"
_ "github.com/lib/pq"
sqldblogger "github.com/simukti/sqldb-logger"
"github.com/simukti/sqldb-logger/logadapter/zapadapter"
"github.com/uptrace/bun"
"github.com/uptrace/bun/dialect/pgdialect"
)
var (
DBConn *xorm.Engine
DB *bun.DB
)
func SetupDatabaseConnection() error {
var err error
// 以下连接方式是采用pgx驱动的时候使用的。
DBConn, err = xorm.NewEngine("pgx", fmt.Sprintf(
"postgresql://%s:%s@%s:%d/%s?sslmode=disable&",
connStr := fmt.Sprintf(
"host=%s user=%s password=%s dbname=%s port=%d sslmode=disable TimeZone=Asia/Shanghai connect_timeout=0",
config.DatabaseSettings.Host,
config.DatabaseSettings.User,
config.DatabaseSettings.Pass,
config.DatabaseSettings.Host,
config.DatabaseSettings.Port,
config.DatabaseSettings.DB,
))
// 以下连接方式是采用lib/pq驱动的时候使用的。
// DBConn, err = xorm.NewEngine("postgres", fmt.Sprintf(
// "host=%s user=%s password=%s dbname=%s port=%d sslmode=disable TimeZone=Asia/Shanghai connect_timeout=0",
// config.DatabaseSettings.Host,
// config.DatabaseSettings.User,
// config.DatabaseSettings.Pass,
// config.DatabaseSettings.DB,
// config.DatabaseSettings.Port,
// ))
config.DatabaseSettings.Port,
)
db, err := sql.Open("postgres", connStr)
if err != nil {
return err
}
xLogger := logger.NewXormZeroLogger(logger.GetLogger())
DBConn.SetLogger(log.NewLoggerAdapter(xLogger))
DBConn.Ping()
DBConn.SetMaxIdleConns(config.DatabaseSettings.MaxIdleConns)
DBConn.SetMaxOpenConns(config.DatabaseSettings.MaxOpenConns)
DBConn.SetConnMaxLifetime(60 * time.Second)
if strings.ToLower(config.ServerSettings.RunMode) == "debug" {
DBConn.ShowSQL(true)
DBConn.Logger().SetLevel(log.LOG_DEBUG)
}
db = sqldblogger.OpenDriver(connStr, db.Driver(), zapadapter.New(logger.Named("PG")))
DB = bun.NewDB(db, pgdialect.New())
DB.SetMaxIdleConns(config.DatabaseSettings.MaxIdleConns)
DB.SetMaxOpenConns(config.DatabaseSettings.MaxOpenConns)
DB.SetConnMaxIdleTime(10 * time.Minute)
DB.SetConnMaxLifetime(60 * time.Minute)
DB.Ping()
return nil
}

10
global/redis.go
View File

@@ -9,13 +9,13 @@ import (
)
var (
RedisConn rueidis.Client
Ctx = context.Background()
Rd rueidis.Client
Ctx = context.Background()
)
func SetupRedisConnection() error {
var err error
RedisConn, err = rueidis.NewClient(rueidis.ClientOption{
Rd, err = rueidis.NewClient(rueidis.ClientOption{
InitAddress: []string{fmt.Sprintf("%s:%d", config.RedisSettings.Host, config.RedisSettings.Port)},
Password: config.RedisSettings.Password,
SelectDB: config.RedisSettings.DB,
@@ -23,8 +23,8 @@ func SetupRedisConnection() error {
if err != nil {
return err
}
pingCmd := RedisConn.B().Ping().Build()
result := RedisConn.Do(Ctx, pingCmd)
pingCmd := Rd.B().Ping().Build()
result := Rd.Do(Ctx, pingCmd)
if result.Error() != nil {
return result.Error()
}