Skip to content

Commit b01ef7a

Browse files
committed
chore: compatible zeabur env
1 parent 0296a45 commit b01ef7a

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

connection/database.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"crypto/tls"
77
"database/sql"
88
"fmt"
9+
910
"github.com/go-sql-driver/mysql"
1011
_ "github.com/go-sql-driver/mysql"
1112
_ "github.com/mattn/go-sqlite3"
@@ -40,7 +41,7 @@ func getConn() *sql.DB {
4041
viper.GetString("mysql.password"),
4142
viper.GetString("mysql.host"),
4243
viper.GetInt("mysql.port"),
43-
viper.GetString("mysql.db"),
44+
utils.GetStringConfs("mysql.db", "mysql.database"),
4445
)
4546
if viper.GetBool("mysql.tls") {
4647
mysql.RegisterTLSConfig("tls", &tls.Config{

utils/base.go

+13-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ package utils
22

33
import (
44
"fmt"
5-
"github.com/goccy/go-json"
65
"math/rand"
76
"time"
7+
8+
"github.com/goccy/go-json"
9+
"github.com/spf13/viper"
810
)
911

1012
func Intn(n int) int {
@@ -332,3 +334,13 @@ func Range(start int, end int) []int {
332334
}
333335
return res
334336
}
337+
338+
func GetStringConfs(key ...string) string {
339+
for _, k := range key {
340+
if v := viper.GetString(k); len(v) > 0 {
341+
return v
342+
}
343+
}
344+
345+
return ""
346+
}

0 commit comments

Comments
 (0)