sqlx: add sqlx db initial logic

internal/conf/conf.go

@@ -122,7 +122,6 @@ func Initialize(suite []string, noDefault bool) {
 	}
 
 	setupLogger()
-	setupDBEngine()
 }
 
 func GetOssDomain() string {

internal/conf/db.go

@@ -0,0 +1,27 @@
+// Copyright 2023 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package conf
+
+import (
+	"sync"
+
+	"github.com/go-redis/redis/v8"
+)
+
+var (
+	_redisClient *redis.Client
+	_onceRedis   sync.Once
+)
+
+func MustRedis() *redis.Client {
+	_onceRedis.Do(func() {
+		_redisClient = redis.NewClient(&redis.Options{
+			Addr:     redisSetting.Host,
+			Password: redisSetting.Password,
+			DB:       redisSetting.DB,
+		})
+	})
+	return _redisClient
+}

internal/conf/db_cgo.go

@@ -18,8 +18,9 @@ const (
 	sqlite3InCgoEnabled = true
 )
 
-func OpenSqlite3() (*sql.DB, error) {
+func OpenSqlite3() (string, *sql.DB, error) {
-	return sql.Open("sqlite3", Sqlite3Setting.Dsn("sqlite3"))
+	db, err := sql.Open("sqlite3", Sqlite3Setting.Dsn("sqlite3"))
+	return "sqlite3", db, err
 }
 
 func gormOpenSqlite3(opts ...gorm.Option) (*gorm.DB, error) {

internal/conf/db_gorm.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/alimy/cfg"
-	"github.com/go-redis/redis/v8"
 	"github.com/sirupsen/logrus"
 	"gorm.io/driver/mysql"
 	"gorm.io/driver/postgres"
@@ -20,8 +19,6 @@ import (
 )
 
 var (
-	Redis *redis.Client
-
 	_gormdb   *gorm.DB
 	_onceGorm sync.Once
 )
@@ -29,14 +26,14 @@ var (
 func MustGormDB() *gorm.DB {
 	_onceGorm.Do(func() {
 		var err error
-		if _gormdb, err = newDBEngine(); err != nil {
+		if _gormdb, err = newGormDB(); err != nil {
 			logrus.Fatalf("new gorm db failed: %s", err)
 		}
 	})
 	return _gormdb
 }
 
-func newDBEngine() (*gorm.DB, error) {
+func newGormDB() (*gorm.DB, error) {
 	newLogger := logger.New(
 		logrus.StandardLogger(), // io writer（日志输出的目标，前缀和日志包含的内容）
 		logger.Config{
@@ -85,11 +82,3 @@ func newDBEngine() (*gorm.DB, error) {
 
 	return db, err
 }
-
-func setupDBEngine() {
-	Redis = redis.NewClient(&redis.Options{
-		Addr:     redisSetting.Host,
-		Password: redisSetting.Password,
-		DB:       redisSetting.DB,
-	})
-}

internal/conf/db_nocgo.go

@@ -19,8 +19,9 @@ const (
 	sqlite3InCgoEnabled = false
 )
 
-func OpenSqlite3() (*sql.DB, error) {
+func OpenSqlite3() (string, *sql.DB, error) {
-	return sql.Open("sqlite", Sqlite3Setting.Dsn("sqlite"))
+	db, err := sql.Open("sqlite", Sqlite3Setting.Dsn("sqlite"))
+	return "sqlite", db, err
 }
 
 func gormOpenSqlite3(opts ...gorm.Option) (*gorm.DB, error) {

internal/conf/db_sqlx.go

@@ -5,9 +5,12 @@
 package conf
 
 import (
+	"database/sql"
 	"sync"
 
+	"github.com/alimy/cfg"
 	"github.com/jmoiron/sqlx"
+	"github.com/sirupsen/logrus"
 )
 
 var (
@@ -17,7 +20,28 @@ var (
 
 func MustSqlxDB() *sqlx.DB {
 	_onceSqlx.Do(func() {
-		// TODO: init sqlx.DB
+		var err error
+		if _sqlxdb, err = newSqlxDB(); err != nil {
+			logrus.Fatalf("new sqlx db failed: %s", err)
+		}
 	})
 	return _sqlxdb
 }
+
+func newSqlxDB() (db *sqlx.DB, err error) {
+	if cfg.If("MySQL") {
+		db, err = sqlx.Open("mysql", MysqlSetting.Dsn())
+	} else if cfg.If("PostgreSQL") || cfg.If("Postgres") {
+		db, err = sqlx.Open("postgres", PostgresSetting.Dsn())
+	} else if cfg.If("Sqlite3") {
+		var (
+			driver string
+			sqldb  *sql.DB
+		)
+		driver, sqldb, err = OpenSqlite3()
+		db = sqlx.NewDb(sqldb, driver)
+	} else {
+		db, err = sqlx.Open("mysql", MysqlSetting.Dsn())
+	}
+	return
+}

internal/migration/migration_embed.go

@@ -44,7 +44,7 @@ func Run() {
 		dbName = (*conf.PostgresSetting)["DBName"]
 		db, err = sql.Open("postgres", conf.PostgresSetting.Dsn())
 	} else if cfg.If("Sqlite3") {
-		db, err = conf.OpenSqlite3()
+		_, db, err = conf.OpenSqlite3()
 	} else {
 		dbName = conf.MysqlSetting.DBName
 		db, err = sql.Open("mysql", conf.MysqlSetting.Dsn())

internal/servants/web/broker/broker.go

@@ -6,6 +6,8 @@ package broker
 
 import (
 	"github.com/alimy/cfg"
+	"github.com/go-redis/redis/v8"
+	"github.com/rocboss/paopao-ce/internal/conf"
 	"github.com/rocboss/paopao-ce/internal/core"
 	"github.com/rocboss/paopao-ce/internal/dao"
 	"github.com/sirupsen/logrus"
@@ -15,6 +17,7 @@ var (
 	ds                 core.DataService
 	ts                 core.TweetSearchService
 	oss                core.ObjectStorageService
+	redisClient        *redis.Client
 	DisablePhoneVerify bool
 )
 
@@ -22,6 +25,7 @@ func Initialize() {
 	ds = dao.DataService()
 	ts = dao.TweetSearchService()
 	oss = dao.ObjectStorageService()
+	redisClient = conf.MustRedis()
 	DisablePhoneVerify = !cfg.If("Sms")
 }
 

internal/servants/web/broker/message.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/rocboss/paopao-ce/internal/conf"
 	"github.com/rocboss/paopao-ce/internal/core"
 	"github.com/rocboss/paopao-ce/pkg/convert"
 	"github.com/rocboss/paopao-ce/pkg/errcode"
@@ -31,7 +30,7 @@ func CreateWhisper(c *gin.Context, msg *core.Message) (*core.Message, error) {
 	whisperKey := fmt.Sprintf("WhisperTimes:%d", msg.SenderUserID)
 
 	// 今日频次限制
-	if res, _ := conf.Redis.Get(c, whisperKey).Result(); convert.StrTo(res).MustInt() >= MAX_WHISPER_NUM_DAILY {
+	if res, _ := redisClient.Get(c, whisperKey).Result(); convert.StrTo(res).MustInt() >= MAX_WHISPER_NUM_DAILY {
 		return nil, errcode.TooManyWhisperNum
 	}
 
@@ -42,11 +41,11 @@ func CreateWhisper(c *gin.Context, msg *core.Message) (*core.Message, error) {
 	}
 
 	// 写入当日（自然日）计数缓存
-	conf.Redis.Incr(c, whisperKey).Result()
+	redisClient.Incr(c, whisperKey).Result()
 
 	currentTime := time.Now()
 	endTime := time.Date(currentTime.Year(), currentTime.Month(), currentTime.Day(), 23, 59, 59, 0, currentTime.Location())
-	conf.Redis.Expire(c, whisperKey, endTime.Sub(currentTime))
+	redisClient.Expire(c, whisperKey, endTime.Sub(currentTime))
 
 	return msg, err
 }

internal/servants/web/broker/post.go

@@ -501,8 +501,8 @@ func DeleteSearchPost(post *core.Post) error {
 }
 
 func PushPostsToSearch(c *gin.Context) {
-	if ok, _ := conf.Redis.SetNX(c, "JOB_PUSH_TO_SEARCH", 1, time.Hour).Result(); ok {
+	if ok, _ := redisClient.SetNX(c, "JOB_PUSH_TO_SEARCH", 1, time.Hour).Result(); ok {
-		defer conf.Redis.Del(c, "JOB_PUSH_TO_SEARCH")
+		defer redisClient.Del(c, "JOB_PUSH_TO_SEARCH")
 
 		splitNum := 1000
 		totalRows, _ := GetPostCount(&core.ConditionsT{

internal/servants/web/broker/user.go

@@ -13,7 +13,6 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/gofrs/uuid"
-	"github.com/rocboss/paopao-ce/internal/conf"
 	"github.com/rocboss/paopao-ce/internal/core"
 	"github.com/rocboss/paopao-ce/pkg/convert"
 	"github.com/rocboss/paopao-ce/pkg/errcode"
@@ -102,7 +101,7 @@ func DoLogin(ctx *gin.Context, param *AuthRequest) (*core.User, error) {
 	}
 
 	if user.Model != nil && user.ID > 0 {
-		if errTimes, err := conf.Redis.Get(ctx, fmt.Sprintf("%s:%d", _LoginErrKey, user.ID)).Result(); err == nil {
+		if errTimes, err := redisClient.Get(ctx, fmt.Sprintf("%s:%d", _LoginErrKey, user.ID)).Result(); err == nil {
 			if convert.StrTo(errTimes).MustInt() >= _MaxLoginErrTimes {
 				return nil, errcode.TooManyLoginError
 			}
@@ -116,14 +115,14 @@ func DoLogin(ctx *gin.Context, param *AuthRequest) (*core.User, error) {
 			}
 
 			// 清空登录计数
-			conf.Redis.Del(ctx, fmt.Sprintf("%s:%d", _LoginErrKey, user.ID))
+			redisClient.Del(ctx, fmt.Sprintf("%s:%d", _LoginErrKey, user.ID))
 			return user, nil
 		}
 
 		// 登录错误计数
-		_, err = conf.Redis.Incr(ctx, fmt.Sprintf("%s:%d", _LoginErrKey, user.ID)).Result()
+		_, err = redisClient.Incr(ctx, fmt.Sprintf("%s:%d", _LoginErrKey, user.ID)).Result()
 		if err == nil {
-			conf.Redis.Expire(ctx, fmt.Sprintf("%s:%d", _LoginErrKey, user.ID), time.Hour).Result()
+			redisClient.Expire(ctx, fmt.Sprintf("%s:%d", _LoginErrKey, user.ID), time.Hour).Result()
 		}
 
 		return nil, errcode.UnauthorizedAuthFailed
@@ -435,12 +434,12 @@ func SendPhoneCaptcha(ctx *gin.Context, phone string) error {
 	}
 
 	// 写入计数缓存
-	conf.Redis.Incr(ctx, "PaoPaoSmsCaptcha:"+phone).Result()
+	redisClient.Incr(ctx, "PaoPaoSmsCaptcha:"+phone).Result()
 
 	currentTime := time.Now()
 	endTime := time.Date(currentTime.Year(), currentTime.Month(), currentTime.Day(), 23, 59, 59, 0, currentTime.Location())
 
-	conf.Redis.Expire(ctx, "PaoPaoSmsCaptcha:"+phone, endTime.Sub(currentTime))
+	redisClient.Expire(ctx, "PaoPaoSmsCaptcha:"+phone, endTime.Sub(currentTime))
 
 	return nil
 }

internal/servants/web/broker/wallet.go

@@ -5,11 +5,11 @@
 package broker
 
 import (
-	"github.com/rocboss/paopao-ce/internal/core"
 	"time"
 
+	"github.com/rocboss/paopao-ce/internal/core"
+
 	"github.com/gin-gonic/gin"
-	"github.com/rocboss/paopao-ce/internal/conf"
 	"github.com/rocboss/paopao-ce/pkg/errcode"
 )
 
@@ -26,7 +26,7 @@ func CreateRecharge(userID, amount int64) (*core.WalletRecharge, error) {
 }
 
 func FinishRecharge(ctx *gin.Context, id int64, tradeNo string) error {
-	if ok, _ := conf.Redis.SetNX(ctx, "PaoPaoRecharge:"+tradeNo, 1, time.Second*5).Result(); ok {
+	if ok, _ := redisClient.SetNX(ctx, "PaoPaoRecharge:"+tradeNo, 1, time.Second*5).Result(); ok {
 		recharge, err := ds.GetRechargeByID(id)
 		if err != nil {
 			return err
@@ -36,7 +36,7 @@ func FinishRecharge(ctx *gin.Context, id int64, tradeNo string) error {
 
 			// 标记为已付款
 			err := ds.HandleRechargeSuccess(recharge, tradeNo)
-			defer conf.Redis.Del(ctx, "PaoPaoRecharge:"+tradeNo)
+			defer redisClient.Del(ctx, "PaoPaoRecharge:"+tradeNo)
 
 			if err != nil {
 				return err

internal/servants/web/routers/api/api.go

@@ -6,6 +6,7 @@ package api
 
 import (
 	"github.com/alimy/cfg"
+	"github.com/go-redis/redis/v8"
 	"github.com/rocboss/paopao-ce/internal/conf"
 	"github.com/rocboss/paopao-ce/internal/core"
 	"github.com/rocboss/paopao-ce/internal/dao"
@@ -14,11 +15,13 @@ import (
 )
 
 var (
+	redisClient   *redis.Client
 	alipayClient  *alipay.Client
 	objectStorage core.ObjectStorageService
 )
 
 func Initialize() {
+	redisClient = conf.MustRedis()
 	objectStorage = dao.ObjectStorageService()
 
 	if cfg.If("Alipay") {

internal/servants/web/routers/api/home.go

@@ -14,7 +14,6 @@ import (
 	"github.com/afocus/captcha"
 	"github.com/gin-gonic/gin"
 	"github.com/gofrs/uuid"
-	"github.com/rocboss/paopao-ce/internal/conf"
 	"github.com/rocboss/paopao-ce/internal/core"
 	"github.com/rocboss/paopao-ce/internal/servants/web/assets"
 	"github.com/rocboss/paopao-ce/internal/servants/web/broker"
@@ -65,7 +64,7 @@ func GetCaptcha(c *gin.Context) {
 	key := util.EncodeMD5(uuid.Must(uuid.NewV4()).String())
 
 	// 五分钟有效期
-	conf.Redis.SetEX(c, "PaoPaoCaptcha:"+key, password, time.Minute*5)
+	redisClient.SetEX(c, "PaoPaoCaptcha:"+key, password, time.Minute*5)
 
 	response := app.NewResponse(c)
 	response.ToResponse(gin.H{
@@ -85,14 +84,14 @@ func PostCaptcha(c *gin.Context) {
 	}
 
 	// 验证图片验证码
-	if res, err := conf.Redis.Get(c.Request.Context(), "PaoPaoCaptcha:"+param.ImgCaptchaID).Result(); err != nil || res != param.ImgCaptcha {
+	if res, err := redisClient.Get(c.Request.Context(), "PaoPaoCaptcha:"+param.ImgCaptchaID).Result(); err != nil || res != param.ImgCaptcha {
 		response.ToErrorResponse(errcode.ErrorCaptchaPassword)
 		return
 	}
-	conf.Redis.Del(c.Request.Context(), "PaoPaoCaptcha:"+param.ImgCaptchaID).Result()
+	redisClient.Del(c.Request.Context(), "PaoPaoCaptcha:"+param.ImgCaptchaID).Result()
 
 	// 今日频次限制
-	if res, _ := conf.Redis.Get(c.Request.Context(), "PaoPaoSmsCaptcha:"+param.Phone).Result(); convert.StrTo(res).MustInt() >= MAX_PHONE_CAPTCHA {
+	if res, _ := redisClient.Get(c.Request.Context(), "PaoPaoSmsCaptcha:"+param.Phone).Result(); convert.StrTo(res).MustInt() >= MAX_PHONE_CAPTCHA {
 		response.ToErrorResponse(errcode.TooManyPhoneCaptchaSend)
 		return
 	}

internal/servants/web/web.go

@@ -19,7 +19,7 @@ import (
 func RouteWeb(e *gin.Engine) {
 	oss := dao.ObjectStorageService()
 	ds := &base.DaoServant{
-		Redis: conf.Redis,
+		Redis: conf.MustRedis(),
 		Ds:    dao.DataService(),
 		Ts:    dao.TweetSearchService(),
 	}