refactor: 重构更新多个文件中的相关调用

features/lm/logbak.go

@@ -10,9 +10,9 @@ import (
 	"be.ems/lib/global"
 	"be.ems/lib/log"
 	"be.ems/lib/services"
+	"be.ems/src/framework/database/db"
 
 	"github.com/gorilla/mux"
-	"xorm.io/xorm"
 )
 
 type XormResponse struct {
@@ -29,58 +29,12 @@ var (
 	CustomExtBackupDataUri = config.UriPrefix + "/dataManagement/{apiVersion}/{dataStorage}/{dataObject}/backup" // for external
 )
 
-var XEngine *xorm.Engine
-
-type DatabaseClient struct {
-	dbType            string
-	dbUrl             string
-	dbConnMaxLifetime time.Duration
-	dbMaxIdleConns    int
-	dbMaxOpenConns    int
-	IsShowSQL         bool
-
-	XEngine *xorm.Engine
-}
-
-var DbClient DatabaseClient
-
 // func init() {
 // 	conf := config.GetYamlConfig()
 // 	InitDbClient(conf.Database.Type, conf.Database.User, conf.Database.Password,
 // 		conf.Database.Host, conf.Database.Port, conf.Database.Name)
 // }
 
-func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName, dbParam string) error {
-	DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?%s",
-		dbUser, dbPassword, dbHost, dbPort, dbName, dbParam)
-	DbClient.dbType = dbType
-	DbClient.dbConnMaxLifetime = 0
-	DbClient.dbMaxIdleConns = 0
-	DbClient.dbMaxOpenConns = 0
-	if log.GetLevel() == log.LOG_TRACE {
-		DbClient.IsShowSQL = true
-	}
-	log.Debugf("dbType:%s dbUrl:%s:", dbType, DbClient.dbUrl)
-
-	var err error
-	DbClient.XEngine, err = xorm.NewEngine(DbClient.dbType, DbClient.dbUrl)
-	if err != nil {
-		log.Error("Failed to connet database:", err)
-		return err
-	}
-	DbClient.XEngine.SetConnMaxLifetime(DbClient.dbConnMaxLifetime)
-	DbClient.XEngine.SetMaxIdleConns(DbClient.dbMaxIdleConns)
-	DbClient.XEngine.SetMaxOpenConns(DbClient.dbMaxOpenConns)
-	DbClient.XEngine.DatabaseTZ = time.Local // 必须
-	DbClient.XEngine.TZLocation = time.Local // 必须
-	if DbClient.IsShowSQL {
-		DbClient.XEngine.ShowSQL(true)
-	}
-	XEngine = DbClient.XEngine
-
-	return nil
-}
-
 func ExtDatabaseBackupData(w http.ResponseWriter, r *http.Request) {
 	log.Debug("ExtDatabaseBackupData processing... ")
 
@@ -126,16 +80,15 @@ func ExtDatabaseBackupData(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	res, err := DbClient.XEngine.Exec(sql)
+	affected, err := db.ExecDB("", sql, nil)
 	if err != nil {
 		log.Error("Failed to exec SQL:", err)
 		services.ResponseInternalServerError500DatabaseOperationFailed(w)
 		return
 	}
-	affected, _ := res.RowsAffected()
 
-	log.Debugf("filePath:%s backup dir:%s", filePath, config.GetYamlConfig().Database.Backup)
-	cmd := exec.Command("cp", "-rf", filePath, config.GetYamlConfig().Database.Backup)
+	log.Debugf("filePath:%s backup dir:%s", filePath, config.GetYamlConfig().OMC.Backup)
+	cmd := exec.Command("cp", "-rf", filePath, config.GetYamlConfig().OMC.Backup)
 	out, err := cmd.CombinedOutput()
 	log.Debugf("Exec output: %v", string(out))
 	if err != nil {