chore: compatible zeabur env

vdsmitnov52 · Jul 23, 2024 · b01ef7a · b01ef7a
1 parent 0296a45
commit b01ef7a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/connection/database.go b/connection/database.go
@@ -6,6 +6,7 @@ import (
 	"crypto/tls"
 	"database/sql"
 	"fmt"
+
 	"github.com/go-sql-driver/mysql"
 	_ "github.com/go-sql-driver/mysql"
 	_ "github.com/mattn/go-sqlite3"
@@ -40,7 +41,7 @@ func getConn() *sql.DB {
 		viper.GetString("mysql.password"),
 		viper.GetString("mysql.host"),
 		viper.GetInt("mysql.port"),
-		viper.GetString("mysql.db"),
+		utils.GetStringConfs("mysql.db", "mysql.database"),
 	)
 	if viper.GetBool("mysql.tls") {
 		mysql.RegisterTLSConfig("tls", &tls.Config{

diff --git a/utils/base.go b/utils/base.go
@@ -2,9 +2,11 @@ package utils
 
 import (
 	"fmt"
-	"github.com/goccy/go-json"
 	"math/rand"
 	"time"
+
+	"github.com/goccy/go-json"
+	"github.com/spf13/viper"
 )
 
 func Intn(n int) int {
@@ -332,3 +334,13 @@ func Range(start int, end int) []int {
 	}
 	return res
 }
+
+func GetStringConfs(key ...string) string {
+	for _, k := range key {
+		if v := viper.GetString(k); len(v) > 0 {
+			return v
+		}
+	}
+
+	return ""
+}