ljydlv
/
videoplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/feat-cid-run-list' into release

This commit is contained in:
junleea 2025-10-02 21:30:16 +08:00
parent da70405ab3 770cde41bd
commit fc0218e754
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
handler/dbm.go
View File

@ -168,6 +168,7 @@ func RunSQLHandler(c *gin.Context) {
resp.Code = proto.ParameterError resp.Code = proto.ParameterError
resp.Message = "请求参数解析错误" resp.Message = "请求参数解析错误"
} else { } else {
log.Println("run sql request, sql is:", req.SQL)
req.UserID = userID req.UserID = userID
res, err2 := service.RunSQL(&req) res, err2 := service.RunSQL(&req)
if err2 != nil { if err2 != nil {
@ -179,7 +180,6 @@ func RunSQLHandler(c *gin.Context) {
resp.Data = res resp.Data = res
} }
} }
log.Println("run sql resp, sql is:", req.SQL)
c.JSON(http.StatusOK, resp) c.JSON(http.StatusOK, resp)
return return
} }

5
service/dbmService.go
View File

@ -39,7 +39,6 @@ func RunSQL(req *proto.RunSQLRequest) (*proto.SQLResult, error) {
func GetGORMDBObject(dbmInfo *proto.DBManage) (db_ *gorm.DB, err error) { func GetGORMDBObject(dbmInfo *proto.DBManage) (db_ *gorm.DB, err error) {
dao.DBMMapRWMutex.RLock() dao.DBMMapRWMutex.RLock()
defer dao.DBMMapRWMutex.RUnlock()
if dao.DBMMap != nil { if dao.DBMMap != nil {
dbValue := dao.DBMMap[dbmInfo.ID] dbValue := dao.DBMMap[dbmInfo.ID]
if dbValue != nil { if dbValue != nil {
@ -47,6 +46,7 @@ func GetGORMDBObject(dbmInfo *proto.DBManage) (db_ *gorm.DB, err error) {
return dbValue.Value, nil return dbValue.Value, nil
} }
} }
dao.DBMMapRWMutex.RUnlock()
switch dbmInfo.DB_Type { switch dbmInfo.DB_Type {
case proto.DB_TYPE_MYSQL: // MySQL case proto.DB_TYPE_MYSQL: // MySQL
@ -57,6 +57,7 @@ func GetGORMDBObject(dbmInfo *proto.DBManage) (db_ *gorm.DB, err error) {
} }
case proto.DB_TYPE_POSTGRES: // PostgreSQL case proto.DB_TYPE_POSTGRES: // PostgreSQL
dsn := "host=" + dbmInfo.DB_IP + " user=" + dbmInfo.DB_User + " password=" + dbmInfo.DB_Password + " dbname=" + dbmInfo.DB_NAME + " port=" + strconv.Itoa(int(dbmInfo.DB_Port)) + " sslmode=disable TimeZone=Asia/Shanghai" dsn := "host=" + dbmInfo.DB_IP + " user=" + dbmInfo.DB_User + " password=" + dbmInfo.DB_Password + " dbname=" + dbmInfo.DB_NAME + " port=" + strconv.Itoa(int(dbmInfo.DB_Port)) + " sslmode=disable TimeZone=Asia/Shanghai"
db_, err = gorm.Open(postgres.Open(dsn), &gorm.Config{}) db_, err = gorm.Open(postgres.Open(dsn), &gorm.Config{})
if err != nil { if err != nil {
return nil, err return nil, err
@ -66,11 +67,11 @@ func GetGORMDBObject(dbmInfo *proto.DBManage) (db_ *gorm.DB, err error) {
} }
dao.DBMMapRWMutex.Lock() dao.DBMMapRWMutex.Lock()
defer dao.DBMMapRWMutex.Unlock()
var dbValue *proto.DBValue var dbValue *proto.DBValue
dbValue.Value = db_ dbValue.Value = db_
dbValue.LastUserTime = worker.GetCurrentTimestamp() dbValue.LastUserTime = worker.GetCurrentTimestamp()
dao.DBMMap[dbmInfo.ID] = dbValue dao.DBMMap[dbmInfo.ID] = dbValue
dao.DBMMapRWMutex.Unlock()
return db_, err return db_, err
} }