mirror of
https://gitee.com/dromara/mayfly-go
synced 2025-12-25 09:06:34 +08:00
Merge pull request #9 from 1ch0/master
fix: store mongodb password incorrectly
This commit is contained in:
@@ -9,6 +9,7 @@ import (
|
|||||||
"mayfly-go/pkg/ctx"
|
"mayfly-go/pkg/ctx"
|
||||||
"mayfly-go/pkg/ginx"
|
"mayfly-go/pkg/ginx"
|
||||||
"mayfly-go/pkg/utils"
|
"mayfly-go/pkg/utils"
|
||||||
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
@@ -34,6 +35,9 @@ func (m *Mongo) Save(rc *ctx.ReqCtx) {
|
|||||||
form := &form.Mongo{}
|
form := &form.Mongo{}
|
||||||
ginx.BindJsonAndValid(rc.GinCtx, form)
|
ginx.BindJsonAndValid(rc.GinCtx, form)
|
||||||
|
|
||||||
|
mongo := new(entity.Mongo)
|
||||||
|
utils.Copy(mongo, form)
|
||||||
|
|
||||||
// 密码脱敏记录日志
|
// 密码脱敏记录日志
|
||||||
form.Uri = func(str string) string {
|
form.Uri = func(str string) string {
|
||||||
reg := regexp.MustCompile(`(^mongodb://.+?:)(.+)(@.+$)`)
|
reg := regexp.MustCompile(`(^mongodb://.+?:)(.+)(@.+$)`)
|
||||||
@@ -41,9 +45,6 @@ func (m *Mongo) Save(rc *ctx.ReqCtx) {
|
|||||||
}(form.Uri)
|
}(form.Uri)
|
||||||
rc.ReqParam = form
|
rc.ReqParam = form
|
||||||
|
|
||||||
mongo := new(entity.Mongo)
|
|
||||||
utils.Copy(mongo, form)
|
|
||||||
|
|
||||||
mongo.SetBaseInfo(rc.LoginAccount)
|
mongo.SetBaseInfo(rc.LoginAccount)
|
||||||
m.MongoApp.Save(mongo)
|
m.MongoApp.Save(mongo)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import (
|
|||||||
"mayfly-go/pkg/model"
|
"mayfly-go/pkg/model"
|
||||||
"mayfly-go/pkg/utils"
|
"mayfly-go/pkg/utils"
|
||||||
"net"
|
"net"
|
||||||
|
"regexp"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.mongodb.org/mongo-driver/mongo"
|
"go.mongodb.org/mongo-driver/mongo"
|
||||||
@@ -95,7 +96,7 @@ func (d *mongoAppImpl) GetMongoCli(id uint64) *mongo.Client {
|
|||||||
|
|
||||||
// -----------------------------------------------------------
|
// -----------------------------------------------------------
|
||||||
|
|
||||||
//mongo客户端连接缓存,指定时间内没有访问则会被关闭
|
// mongo客户端连接缓存,指定时间内没有访问则会被关闭
|
||||||
var mongoCliCache = cache.NewTimedCache(constant.MongoConnExpireTime, 5*time.Second).
|
var mongoCliCache = cache.NewTimedCache(constant.MongoConnExpireTime, 5*time.Second).
|
||||||
WithUpdateAccessTime(true).
|
WithUpdateAccessTime(true).
|
||||||
OnEvicted(func(key interface{}, value interface{}) {
|
OnEvicted(func(key interface{}, value interface{}) {
|
||||||
@@ -177,7 +178,10 @@ func connect(me *entity.Mongo) (*MongoInstance, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
global.Log.Infof("连接mongo: %s", me.Uri)
|
global.Log.Infof("连接mongo: %s", func(str string) string {
|
||||||
|
reg := regexp.MustCompile(`(^mongodb://.+?:)(.+)(@.+$)`)
|
||||||
|
return reg.ReplaceAllString(str, `${1}****${3}`)
|
||||||
|
}(me.Uri))
|
||||||
mongoInstance.Cli = client
|
mongoInstance.Cli = client
|
||||||
return mongoInstance, err
|
return mongoInstance, err
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user