..

models/eta_trial/edbdata_classify.go

@@ -1,7 +1,7 @@
 package eta_trial
 
 import (
-	"hongze/hz_crm_eta/global"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -19,10 +19,18 @@ func (m *EdbdataClassify) TableName() string {
 }
 
 func (m *EdbdataClassify) GetItemsByCondition(cond string, pars []interface{}, fieldArr []string, orderRule string) (items []*EdbdataClassify, err error) {
-	order := `create_time DESC`
+
+	o := orm.NewOrmUsingDB("edb_trial")
+	sql := `SELECT * FROM edbdata_classify where 1=1`
+	if cond != "" {
+		sql += cond
+	}
+	order := ` order by create_time DESC`
 	if orderRule != "" {
-		order = orderRule
+		sql += orderRule
+	} else {
+		sql += order
 	}
-	err = global.MYSQL["edb_trial"].Where(cond, pars...).Order(order).Find(&items).Error
+	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }

models/eta_trial/manual_user.go

@@ -1,7 +1,7 @@
 package eta_trial
 
 import (
-	"hongze/hz_crm_eta/global"
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -20,7 +20,8 @@ func (m *ManualUser) TableName() string {
 }
 
 func (m *ManualUser) Create() (err error) {
-	err = global.MYSQL["hz_data_trial"].Create(m).Error
+	o := orm.NewOrmUsingDB("hz_data_trial")
+	_, err = o.Insert(m)
 	return
 }
 

models/eta_trial/manual_user_classify.go

@@ -1,6 +1,7 @@
 package eta_trial
 
 import (
+	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -16,11 +17,13 @@ func (m *ManualUserClassify) TableName() string {
 }
 
 func (m *ManualUserClassify) Create() (err error) {
-	err = global.MYSQL["hz_data_trial"].Create(m).Error
+	o := orm.NewOrmUsingDB("hz_data_trial")
+	_, err = o.Insert(m)
 	return
 }
 
 func (m *ManualUserClassify) BatchCreate(items []*ManualUserClassify) (err error) {
-	err = global.MYSQL["hz_data_trial"].CreateInBatches(items, len(items)).Error
+	o := orm.NewOrmUsingDB("hz_data_trial")
+	_, err = o.InsertMulti(len(items), items)
 	return
 }

utils/common.go

@@ -1302,9 +1302,3 @@ func (ms MapSorter) Less(i, j int) bool {
 func (ms MapSorter) Swap(i, j int) {
 	ms[i], ms[j] = ms[j], ms[i]
 }
-
-// md5加密
-func MD5(data string) string {
-	m := md5.Sum([]byte(data))
-	return hex.EncodeToString(m[:])
-}