fix

xmongo/new_mongo.go

@@ -5,12 +5,14 @@ import (
 	"github.com/pkg/errors"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
+	"sync"
 	"time"
 )
 
 var (
 	client  *mongo.Client
 	mongoDB *mongo.Database
+	mongoLock = &sync.RWMutex{}
 )
 
 type MongoConf struct {
@@ -24,6 +26,8 @@ func InitMongoDB(conf *MongoConf) error {
 		return errors.New("conf param invalid")
 	}
 
+	mongoLock.Lock()
+	defer mongoLock.Unlock()
 	client, err := mongo.NewClient(options.Client().ApplyURI(conf.Url))
 	if err != nil {
 		return errors.WithStack(err)
@@ -45,6 +49,8 @@ type MongoCollection struct {
 }
 
 func NewMongoCollection(coll string) *MongoCollection {
+	mongoLock.RLock()
+	defer mongoLock.RUnlock()
 	return &MongoCollection{mongoDB.Collection(coll)}
 }
 
@@ -53,5 +59,7 @@ func CloseMongo() error {
 		return errors.New("mongo client invalid")
 	}
 
+	mongoLock.RLock()
+	defer mongoLock.RUnlock()
 	return client.Disconnect(context.TODO())
 }

xmysql/new_mysql.go

@@ -8,9 +8,13 @@ import (
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 	"gorm.io/gorm/schema"
+	"sync"
 )
 
-var newMysqlPools = make(map[string]*gorm.DB)
+var (
+	newMysqlPools = make(map[string]*gorm.DB)
+	mysqlLock     = &sync.RWMutex{}
+)
 
 func InitMySql(configs []*MySqlPoolConfig) error {
 	for _, c := range configs {
@@ -21,7 +25,7 @@ func InitMySql(configs []*MySqlPoolConfig) error {
 		if err != nil {
 			return errors.New(fmt.Sprintf("mysql pool %s error %v", xjson.SafeMarshal(c), err))
 		}
-		xsync.WithLock(mysqlPoolLock, func() {
+		xsync.WithLock(mysqlLock, func() {
 			newMysqlPools[c.Alias] = p
 		})
 	}
@@ -51,13 +55,13 @@ func createNewMySqlPool(c *MySqlPoolConfig) (*gorm.DB, error) {
 }
 
 func GetMySqlConn(alias string) *gorm.DB {
-	mysqlPoolLock.RLock()
-	defer mysqlPoolLock.RUnlock()
+	mysqlLock.RLock()
+	defer mysqlLock.RUnlock()
 	return newMysqlPools[alias]
 }
 
 func CloseMysql() {
-	xsync.WithLock(mysqlPoolLock, func() {
+	xsync.WithLock(mysqlLock, func() {
 		for _, db := range newMysqlPools {
 			if db == nil {
 				continue