feat 结构调整

Server/common/db/mysql/client.go

@@ -2,9 +2,7 @@ package mysql
 
 import (
 	"common/config"
-	pointQuery "common/db/mysql/point/query"
 	"common/log"
-	"database/sql"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
@@ -13,23 +11,14 @@ import (
 
 type DBName string
 
-const (
-	DBNamePoint DBName = "point"
-)
-
-var dbs = make(map[DBName]*sql.DB)
-var queryS = make(map[DBName]interface{})
+var dbs = make(map[DBName]*gorm.DB)
 
 func Init(cfg map[string]*config.MySQLConfig) error {
 	for name, oneConfig := range cfg {
-		switch DBName(name) {
-		case DBNamePoint:
-			if db, err := initOneDB(oneConfig); err != nil {
-				return err
-			} else {
-				dbs[DBNamePoint], _ = db.DB()
-				queryS[DBNamePoint] = pointQuery.Use(db)
-			}
+		if db, err := initOneDB(oneConfig); err != nil {
+			return err
+		} else {
+			dbs[DBName(name)] = db
 		}
 	}
 	return nil
@@ -73,15 +62,12 @@ func parseLogLevel(logLevel string) logger.LogLevel {
 	return logger.Info
 }
 
-func GetPointDB() *pointQuery.Query {
-	return getQuery[*pointQuery.Query](DBNamePoint)
-}
-
-func getQuery[T any](dbName DBName) (result T) {
-	if q, ok := queryS[dbName]; ok {
-		result, _ = q.(T)
+func GetDB(dbName DBName) *gorm.DB {
+	if q, ok := dbs[dbName]; ok {
+		return q
 	}
-	return
+	log.Errorf("db %s not found", dbName)
+	return nil
 }
 
 func Close() error {
@@ -89,8 +75,10 @@ func Close() error {
 		return nil
 	}
 	for name, db := range dbs {
-		if err := db.Close(); err != nil {
-			log.Errorf("close db %s error: %v", name, err)
+		if sqlDB, _ := db.DB(); sqlDB != nil {
+			if err := sqlDB.Close(); err != nil {
+				log.Errorf("close db %s error: %v", name, err)
+			}
 		}
 	}
 	return nil