marge: 合并11.2版本

lib/dborm/dborm.go

@@ -16,6 +16,7 @@ import (
 
 	_ "github.com/go-sql-driver/mysql"
 	"xorm.io/xorm"
+	"xorm.io/xorm/core"
 )
 
 const (
@@ -124,6 +125,14 @@ func XormConnectDatabase(dbType, dbUser, dbPassword, dbHost, dbPort, dbName stri
 	return xEngine, nil
 }
 
+func XCoreDB() *core.DB {
+	return xEngine.DB()
+}
+
+func XEngDB() *xorm.Engine {
+	return xEngine
+}
+
 func ConstructInsertSQL(tableName string, insertData interface{}) (string, []string) {
 	log.Debug("ConstructInsertSQL processing... ")
 	log.Debug("Request insertData:", insertData)
@@ -419,68 +428,6 @@ func XormParseResult(body []byte) ([]NeInfo, error) {
 	return neInfo, nil
 }
 
-type ParamConfig struct {
-	//	Id         int    `json:"id" xorm:"pk 'id' autoincr"`
-	NeType     string `json:"neType"`
-	NeId       string `json:"neId"`
-	TopTag     string `json:"topTag"`
-	TopDisplay string `json:"topDisplay"`
-	ParamJson  string `json:"paramJson"`
-}
-
-func XormInsertParamConfig(mapJson *map[string]interface{}) (int64, error) {
-	var affected, a int64
-	var err error
-	paramConfig := new(ParamConfig)
-	for n, d := range *mapJson {
-		if d == nil {
-			break
-		}
-		log.Debugf("n: %s", n)
-
-		for t, p := range d.(map[string]interface{}) {
-			if p == nil {
-				break
-			}
-			log.Debug("t:", t)
-			log.Debug("p:", p)
-			for k, v := range p.(map[string]interface{}) {
-				log.Debug("k, v: ", k, v)
-				if k == "display" {
-					paramConfig.TopDisplay = fmt.Sprintf("%v", v)
-
-				} else {
-					pc, _ := json.Marshal(v)
-					paramConfig.ParamJson = fmt.Sprintf("{\"%v\":%v}", k, string(pc))
-				}
-			}
-
-			paramConfig.NeType = strings.ToUpper(n)
-			paramConfig.NeId = ""
-			paramConfig.TopTag = t
-			//			paramConfig.TopDisplay = p["display"]
-			//			paramConfig.ParamJson = p.(string)
-
-			log.Debug("paramConfig:", paramConfig)
-
-			xSession := xEngine.NewSession()
-			defer xSession.Close()
-			_, err = xSession.Table("param_config").Where("ne_type = ? and top_tag = ?", paramConfig.NeType, paramConfig.TopTag).Delete()
-			if err != nil {
-				log.Error("Failed to insert param_config:", err)
-			}
-			a, err = xSession.Insert(paramConfig)
-			if err != nil {
-				log.Error("Failed to insert param_config:", err)
-			}
-			affected += a
-			xSession.Commit()
-		}
-	}
-
-	return affected, err
-}
-
 func ConstructUpdateSQLArray(tableName string, updateData interface{}, whereCondition string) (string, []string) {
 	log.Debug("ConstructUpdateSQL processing... ")
 	log.Debug("Request updateData:", updateData)