Merge remote-tracking branch 'origin/dm' into debug_bak

global/global.go

@@ -0,0 +1,16 @@
+package global
+
+import (
+	_ "github.com/go-sql-driver/mysql"
+	"gorm.io/gorm"
+)
+
+var (
+	DbMap      map[string]*gorm.DB //数据库连接配置
+	DEFAULT_DB *gorm.DB            //默认数据库连接配置
+)
+
+func init() {
+	// 初始化数据库连接
+	InitDb()
+}

global/initDb.go

@@ -0,0 +1,140 @@
+package global
+
+import (
+	"database/sql/driver"
+	_ "dm"
+	dm "dmgorm2"
+	"eta/eta_report/utils"
+	"fmt"
+	"gorm.io/driver/mysql"
+	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
+	"gorm.io/gorm/schema"
+	"io"
+	"log"
+	"os"
+	"strings"
+	"time"
+)
+
+type LocalTime time.Time
+
+// InitDb
+// @Description: 数据库初始化
+func InitDb() {
+	dbMap := make(map[string]*gorm.DB)
+
+	//开启日志
+	logWriter := io.MultiWriter(utils.Binlog) //binlog日志，记录到文件中去
+	if utils.RunMode == `dev` {               // 测试环境，默认输出在控制台，不需要的话，可以注释if里面下面的这行
+		logWriter = io.MultiWriter(utils.Binlog, os.Stdout)
+	}
+	newLogger := logger.New(log.New(logWriter, "\r\n", log.LstdFlags), logger.Config{
+		SlowThreshold:             200 * time.Millisecond, //慢sql ：200ms
+		LogLevel:                  logger.Info,            //记录的日志类型，info代表所有信息都记录
+		IgnoreRecordNotFoundError: true,                   //是否忽略找不到数据错误信息（只是日志记录记录成err还是普通的输出的区别，并不影响业务代码中的：找不到数据行error）
+		Colorful:                  false,                  //是否颜色输出
+	})
+
+	// 默认库
+	// 报告库
+	connectDb(utils.MYSQL_URL, utils.DbNameReport, newLogger, dbMap, true)
+
+	// master库
+	connectDb(utils.MYSQL_URL_ETA, utils.DbNameMaster, newLogger, dbMap, false)
+
+	// 用户主库
+	if utils.MYSQL_WEEKLY_URL != `` && (utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox) {
+		connectDb(utils.MYSQL_WEEKLY_URL, utils.DbNameWeekly, newLogger, dbMap, false)
+	}
+
+	//全局赋值数据库链接
+	DbMap = dbMap
+
+}
+
+// connectDb
+// @Description: 达梦数据库连接
+// @param dsn
+// @param aliasName
+// @param newLogger
+// @param dbMap
+// @param isDefault
+func connectDb(dsn, aliasName string, newLogger logger.Interface, dbMap map[string]*gorm.DB, isDefault bool) {
+	//fmt.Println("dsn:", dsn, "  ==  ;aliasName:", aliasName)
+	if dsn == `` {
+		return
+	}
+
+	var dialector gorm.Dialector
+	switch utils.DbDriverName {
+	case utils.DbDriverByMysql:
+		if !strings.Contains(dsn, `parseTime`) {
+			dsn += `&parseTime=true`
+		}
+		dialector = mysql.Open(dsn)
+	case utils.DbDriverByDm:
+		dialector = dm.Open(dsn)
+	default:
+		panic(fmt.Errorf("数据库 链接异常，错误的数据库类型，数据库:%s", utils.DbDriverName))
+	}
+	db, err := gorm.Open(dialector, &gorm.Config{
+		Logger: newLogger,
+		NamingStrategy: schema.NamingStrategy{
+			SingularTable: true, // 表示使用单数表名，启用该选项后，GORM 将不会对表名进行复数化处理
+		},
+	})
+	if err != nil {
+		//global.LOG.Errorf("mysql 启动异常，数据库:default;Err：", err)
+		panic(fmt.Errorf("数据库 链接异常，数据库:%s;Err:%s", aliasName, err))
+	}
+	//创建连接池
+	sqlDB, err := db.DB()
+	if err != nil {
+		//global.LOG.Errorf("达梦 创建连接池失败，数据库:default;Err：", err)
+		panic(fmt.Errorf("数据库 创建连接池失败，数据库:%s;Err:%s", aliasName, err))
+	}
+
+	dbMap[aliasName] = db
+
+	//默认数据库连接
+	if isDefault {
+		DEFAULT_DB = db
+	}
+
+	// SetMaxIdleConns 设置空闲连接池中连接的最大数量
+	sqlDB.SetMaxIdleConns(50)
+
+	// SetMaxOpenConns 设置打开数据库连接的最大数量。
+	sqlDB.SetMaxOpenConns(100)
+
+	// SetConnMaxLifetime 设置了连接可复用的最大时间。
+	sqlDB.SetConnMaxLifetime(10 * time.Minute)
+
+}
+
+func (t *LocalTime) MarshalJSON() ([]byte, error) {
+	tTime := time.Time(*t)
+	if tTime.IsZero() {
+		return []byte("\"\""), nil
+	}
+	return []byte(fmt.Sprintf("\"%v\"", tTime.Format("2006-01-02 15:04:05"))), nil
+}
+
+func (t LocalTime) Value() (driver.Value, error) {
+	var zeroTime time.Time
+	tlt := time.Time(t)
+	//判断给定时间是否和默认零时间的时间戳相同
+	if tlt.UnixNano() == zeroTime.UnixNano() {
+		return nil, nil
+	}
+	return tlt, nil
+}
+
+func (t *LocalTime) Scan(v interface{}) error {
+	if value, ok := v.(time.Time); ok {
+		*t = LocalTime(value)
+		return nil
+	}
+	return fmt.Errorf("can not convert %v to timestamp", v)
+}

go.mod

@@ -12,6 +12,8 @@ require (
 	github.com/minio/minio-go/v7 v7.0.69
 	github.com/rdlucklib/rdluck_tools v1.0.3
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
+	gorm.io/driver/mysql v1.5.7
+	gorm.io/gorm v1.25.12
 )
 
 require (
@@ -20,8 +22,11 @@ require (
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.17.6 // indirect

go.sum

@@ -76,6 +76,7 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -90,6 +91,10 @@ github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
+github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
@@ -274,3 +279,8 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo=
+gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
+gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
+gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=

models/business_conf.go

@@ -1,7 +1,8 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_report/global"
+	"eta/eta_report/utils"
 	"html"
 	"time"
 )
@@ -41,9 +42,10 @@ func GetBusinessConf() (list map[string]string, err error) {
 	list = make(map[string]string)
 
 	var items []*BusinessConf
-	o := orm.NewOrmUsingDB("eta")
+	//o := orm.NewOrmUsingDB("eta")
 	sql := `SELECT * FROM business_conf`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DbMap[utils.DbNameMaster].Raw(sql).Find(&items).Error
 	if err != nil {
 		return
 	}

models/db.go

@@ -8,7 +8,7 @@ import (
 	"github.com/beego/beego/v2/client/orm"
 )
 
-func init() {
+func init2() {
 	// eta_report
 	_ = orm.RegisterDataBase("default", "mysql", utils.MYSQL_URL)
 	orm.SetMaxIdleConns("default", 50)

models/english_company.go

@@ -1,13 +1,14 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_report/global"
 	"time"
 )
 
 // EnglishCompany 英文客户
 type EnglishCompany struct {
-	CompanyId   int       `orm:"column(company_id);pk" description:"英文客户ID"`
+	//CompanyId   int       `orm:"column(company_id);pk" description:"英文客户ID"`
+	CompanyId   int       `gorm:"column:company_id;primaryKey" description:"英文客户ID"`
 	CompanyName string    `description:"客户名称"`
 	CountryCode string    `description:"国家Code"`
 	Country     string    `description:"国家"`
@@ -24,12 +25,13 @@ func (item *EnglishCompany) TableName() string {
 }
 
 func (item *EnglishCompany) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.CompanyId = int(id)
+	//o := orm.NewOrm()
+	//id, err := o.Insert(item)
+	//if err != nil {
+	//	return
+	//}
+	//item.CompanyId = int(id)
+	err = global.DEFAULT_DB.Create(&item).Error
 	return
 }
 
@@ -43,39 +45,44 @@ type EnglishCompanySaveReq struct {
 }
 
 func (item *EnglishCompany) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(item, cols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(item, cols...)
+	err = global.DEFAULT_DB.Model(&item).Select(cols).Updates(&item).Error
 	return
 }
 
 // GetEnglishCompanyById 主键获取客户
 func GetEnglishCompanyById(id int) (item *EnglishCompany, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM english_company WHERE is_deleted = 0 AND company_id = ? LIMIT 1`
-	err = o.Raw(sql, id).QueryRow(&item)
+	//err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, id).First(&item).Error
 	return
 }
 
 // GetEnglishCompanyByName 名称获取客户
 func GetEnglishCompanyByName(companyName string) (item *EnglishCompany, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM english_company WHERE is_deleted = 0 AND company_name = ? LIMIT 1`
-	err = o.Raw(sql, companyName).QueryRow(&item)
+	//err = o.Raw(sql, companyName).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, companyName).First(&item).Error
 	return
 }
 
 // UpdateEnglishCompanyViewTotal 更新英文客户阅读量
 func UpdateEnglishCompanyViewTotal(companyId int) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE english_company SET view_total = view_total+1 WHERE company_id = ? `
-	_, err = o.Raw(sql, companyId).Exec()
+	//_, err = o.Raw(sql, companyId).Exec()
+	err = global.DEFAULT_DB.Exec(sql, companyId).Error
 	return
 }
 
 // UpdateTrialEnglishCompanyViewTotal 更新英文客户阅读量-ETA试用平台
 func UpdateTrialEnglishCompanyViewTotal(companyId int) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE english_company SET view_total = view_total+1 WHERE company_id = ? `
-	_, err = o.Raw(sql, companyId).Exec()
+	//_, err = o.Raw(sql, companyId).Exec()
+	err = global.DEFAULT_DB.Exec(sql, companyId).Error
 	return
 }

models/english_report.go

@@ -1,6 +1,8 @@
 package models
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta/eta_report/global"
+)
 
 type EnglishReportDetail struct {
 	Id                 int    `orm:"column(id)" description:"报告Id"`
@@ -31,9 +33,10 @@ type EnglishReportDetail struct {
 }
 
 func GetEnglishReportByCode(reportCode string) (item *EnglishReportDetail, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM english_report WHERE report_code=?`
-	err = o.Raw(sql, reportCode).QueryRow(&item)
+	//err = o.Raw(sql, reportCode).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, reportCode).First(&item).Error
 	return
 }
 
@@ -49,36 +52,41 @@ type EnglishReportShareDetailResp struct {
 }
 
 func UpdateEnglishReportCounts(reportCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE english_report SET pv = pv+1 WHERE report_code = ?  `
-	_, err = o.Raw(sql, reportCode).Exec()
+	//_, err = o.Raw(sql, reportCode).Exec()
+	err = global.DEFAULT_DB.Exec(sql, reportCode).Error
 	return
 }
 
 func UpdateEnglishReportEmailCounts(reportCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE english_report SET pv_email = pv_email+1 WHERE report_code = ?  `
-	_, err = o.Raw(sql, reportCode).Exec()
+	//_, err = o.Raw(sql, reportCode).Exec()
+	err = global.DEFAULT_DB.Exec(sql, reportCode).Error
 	return
 }
 
 func GetTrialEnglishReportByCode(reportCode string) (item *EnglishReportDetail, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM english_report WHERE report_code=?`
-	err = o.Raw(sql, reportCode).QueryRow(&item)
+	//err = o.Raw(sql, reportCode).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, reportCode).First(&item).Error
 	return
 }
 
 func UpdateTrialEnglishReportCounts(reportCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE english_report SET pv = pv+1 WHERE report_code = ?  `
-	_, err = o.Raw(sql, reportCode).Exec()
+	//_, err = o.Raw(sql, reportCode).Exec()
+	err = global.DEFAULT_DB.Exec(sql, reportCode).Error
 	return
 }
 
 func UpdateTrialEnglishReportEmailCounts(reportCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE english_report SET pv_email = pv_email+1 WHERE report_code = ?  `
-	_, err = o.Raw(sql, reportCode).Exec()
+	//_, err = o.Raw(sql, reportCode).Exec()
+	err = global.DEFAULT_DB.Exec(sql, reportCode).Error
 	return
 }

models/english_report_email.go

@@ -1,13 +1,14 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_report/global"
 	"time"
 )
 
 // EnglishReportEmail 英文研报-邮箱/客户联系人
 type EnglishReportEmail struct {
-	Id           int       `orm:"column(id);pk" description:"邮箱ID"`
+	//Id           int       `orm:"column(id);pk" description:"邮箱ID"`
+	Id           int       `gorm:"column:id;primaryKey" description:"邮箱ID"`
 	CompanyId    int       `description:"客户ID"`
 	Name         string    `description:"联系人名称"`
 	Email        string    `description:"邮箱地址"`
@@ -32,49 +33,55 @@ type EnglishReportEmailSaveReq struct {
 }
 
 func (item *EnglishReportEmail) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.Id = int(id)
+	//o := orm.NewOrm()
+	//id, err := o.Insert(item)
+	//if err != nil {
+	//	return
+	//}
+	//item.Id = int(id)
+	err = global.DEFAULT_DB.Create(&item).Error
 	return
 }
 
 func (item *EnglishReportEmail) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(item, cols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(item, cols...)
+	err = global.DEFAULT_DB.Model(&item).Select(cols).Updates(&item).Error
 	return
 }
 
 // GetEnglishReportEmailById 主键获取邮箱
 func GetEnglishReportEmailById(id int) (item *EnglishReportEmail, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM english_report_email WHERE is_deleted = 0 AND id = ? LIMIT 1`
-	err = o.Raw(sql, id).QueryRow(&item)
+	//err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, id).First(&item).Error
 	return
 }
 
 // UpdateEnglishReportEmailViewTotal 更新英文联系人阅读量
 func UpdateEnglishReportEmailViewTotal(emailId int) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE english_report_email SET view_total = view_total+1, last_view_time = NOW() WHERE id = ? `
-	_, err = o.Raw(sql, emailId).Exec()
+	//_, err = o.Raw(sql, emailId).Exec()
+	err = global.DEFAULT_DB.Exec(sql, emailId).Error
 	return
 }
 
 // GetTrialEnglishReportEmailById 主键获取邮箱-ETA试用平台
 func GetTrialEnglishReportEmailById(id int) (item *EnglishReportEmail, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM english_report_email WHERE is_deleted = 0 AND id = ? LIMIT 1`
-	err = o.Raw(sql, id).QueryRow(&item)
+	//err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, id).First(&item).Error
 	return
 }
 
 // UpdateTrialEnglishReportEmailViewTotal 更新英文联系人阅读量-ETA试用平台
 func UpdateTrialEnglishReportEmailViewTotal(emailId int) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE english_report_email SET view_total = view_total+1, last_view_time = NOW() WHERE id = ? `
-	_, err = o.Raw(sql, emailId).Exec()
+	//_, err = o.Raw(sql, emailId).Exec()
+	err = global.DEFAULT_DB.Exec(sql, emailId).Error
 	return
 }

models/english_report_email_pv.go

@@ -1,13 +1,14 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_report/global"
 	"time"
 )
 
 // EnglishReportEmailPV 英文研报-邮箱pv
 type EnglishReportEmailPV struct {
-	Id         int       `orm:"column(id);pk"`
+	//Id         int       `orm:"column(id);pk"`
+	Id         int       `gorm:"column:id;primaryKey"`
 	ReportId   int       `description:"英文报告ID"`
 	EmailId    int       `description:"邮箱ID"`
 	CreateTime time.Time `description:"创建时间"`
@@ -15,8 +16,9 @@ type EnglishReportEmailPV struct {
 
 // InsertTrialEnglishReportEmailPV ETA试用平台-新增英文邮箱PV
 func InsertTrialEnglishReportEmailPV(item *EnglishReportEmailPV) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `INSERT INTO english_report_email_pv(report_id, email_id, create_time) VALUES(?, ?, ?)`
-	_, err = o.Raw(sql, item.ReportId, item.EmailId, item.CreateTime).Exec()
+	//_, err = o.Raw(sql, item.ReportId, item.EmailId, item.CreateTime).Exec()
+	err = global.DEFAULT_DB.Exec(sql, item.ReportId, item.EmailId, item.CreateTime).Error
 	return
 }

models/outside_report.go

@@ -2,11 +2,13 @@
 package models
 
 import (
+	"eta/eta_report/global"
 	"github.com/beego/beego/v2/client/orm"
 )
 
 type OutsideReport struct {
-	OutsideReportId  int    `orm:"column(outside_report_id);pk" description:"外部报告ID"`
+	//OutsideReportId  int    `orm:"column(outside_report_id);pk" description:"外部报告ID"`
+	OutsideReportId  int    `gorm:"column:outside_report_id;primaryKey" description:"外部报告ID"`
 	Source           int    `orm:"column(source)" description:"来源，1：ETA系统录入；2：API接口录入；3：邮件监听录入"`
 	Title            string `orm:"column(title)" description:"报告标题"`
 	Abstract         string `orm:"column(abstract)" description:"摘要"`
@@ -23,7 +25,8 @@ type OutsideReport struct {
 }
 
 type OutsideReportBO struct {
-	OutsideReportId int    `orm:"column(outside_report_id);pk" description:"外部报告ID"`
+	//OutsideReportId int    `orm:"column(outside_report_id);pk" description:"外部报告ID"`
+	OutsideReportId int    `gorm:"column:outside_report_id;primaryKey" description:"外部报告ID"`
 	Source          int    `orm:"column(source)" description:"来源，1：ETA系统录入；2：API接口录入；3：邮件监听录入"`
 	Title           string `orm:"column(title)" description:"报告标题"`
 	Abstract        string `orm:"column(abstract)" description:"摘要"`
@@ -54,10 +57,11 @@ func init() {
 
 // GetOutsideReportListByConditionCount 根据条件查询列表条数
 func GetOutsideReportListByConditionCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `select count(distinct t1.outside_report_id) from outside_report t1 left join chart_permission_search_key_word_mapping t2 on t1.classify_id = t2.classify_id  where 1 = 1 `
 	sql += condition
-	err = o.Raw(sql, pars).QueryRow(&count)
+	//err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Scan(&count).Error
 	if err != nil {
 		return 0, err
 	}
@@ -67,9 +71,10 @@ func GetOutsideReportListByConditionCount(condition string, pars []interface{})
 
 // GetOutsideReportByReportCode 根据Code获取报告
 func GetOutsideReportByReportCode(reportCode string) (outsideReport *OutsideReport, err error) {
-	o := orm.NewOrm()
-	
+	//o := orm.NewOrm()
+
 	sql := `SELECT * FROM outside_report WHERE report_code=?`
-	err = o.Raw(sql, reportCode).QueryRow(&outsideReport)
+	//err = o.Raw(sql, reportCode).QueryRow(&outsideReport)
+	err = global.DEFAULT_DB.Raw(sql, reportCode).First(&outsideReport).Error
 	return outsideReport, err
 }

models/outside_report_attachment.go

@@ -1,10 +1,14 @@
 // @Author gmy 2024/9/19 15:13:00
 package models
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta/eta_report/global"
+	"github.com/beego/beego/v2/client/orm"
+)
 
 type OutsideReportAttachment struct {
-	OutsideReportAttachmentId int    `orm:"column(outside_report_attachment_id);pk" description:"外部报告附件ID"`
+	//OutsideReportAttachmentId int    `orm:"column(outside_report_attachment_id);pk" description:"外部报告附件ID"`
+	OutsideReportAttachmentId int    `gorm:"column:outside_report_attachment_id;primaryKey" description:"外部报告附件ID"`
 	OutsideReportId           int    `orm:"column(outside_report_id)" description:"报告id"`
 	Title                     string `orm:"column(title)" description:"附件名称"`
 	Url                       string `orm:"column(url)" description:"附件地址"`
@@ -19,11 +23,12 @@ func init() {
 
 // GetOutsideReportAttachmentListByReportId 根据报告id获取附件列表
 func GetOutsideReportAttachmentListByReportId(outsideReportId int) (attachmentList []*OutsideReportAttachment, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	// 改写成通过ql查询
 	sql := `select * from outside_report_attachment where outside_report_id = ?`
 
-	_, err = o.Raw(sql, outsideReportId).QueryRows(&attachmentList)
+	//_, err = o.Raw(sql, outsideReportId).QueryRows(&attachmentList)
+	err = global.DEFAULT_DB.Raw(sql, outsideReportId).Find(&attachmentList).Error
 	if err != nil {
 		return nil, err
 	}

models/report.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_report/global"
 	"time"
 )
 
@@ -58,9 +58,10 @@ type Report struct {
 }
 
 func GetReportByCode(reportCode string) (item *Report, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM report WHERE report_code=?`
-	err = o.Raw(sql, reportCode).QueryRow(&item)
+	//err = o.Raw(sql, reportCode).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, reportCode).First(&item).Error
 	return
 }
 
@@ -87,8 +88,9 @@ type ReportItem struct {
 // @param reportId int
 // @return err error
 func UpdateReportPv(reportId int) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE report SET pv = pv + 1 WHERE id = ?`
-	_, err = o.Raw(sql, reportId).Exec()
+	//_, err = o.Raw(sql, reportId).Exec()
+	err = global.DEFAULT_DB.Exec(sql, reportId).Error
 	return
 }

models/report_chapter.go

@@ -1,13 +1,14 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_report/global"
 	"time"
 )
 
 // ReportChapter 报告章节
 type ReportChapter struct {
-	ReportChapterId   int       `orm:"column(report_chapter_id);pk" description:"报告章节ID"`
+	//ReportChapterId   int       `orm:"column(report_chapter_id);pk" description:"报告章节ID"`
+	ReportChapterId   int       `gorm:"column:report_chapter_id;primaryKey" description:"报告章节ID"`
 	ReportId          int       `description:"报告ID"`
 	ReportType        string    `description:"报告类型 day-晨报 week-周报"`
 	ClassifyIdFirst   int       `description:"一级分类id"`
@@ -38,8 +39,9 @@ type ReportChapter struct {
 
 // GetPublishedChapterListByReportId 根据ReportId获取已发布章节列表
 func GetPublishedChapterListByReportId(reportId int) (list []*ReportChapter, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM report_chapter WHERE report_id = ? AND publish_state = 2 ORDER BY sort ASC`
-	_, err = o.Raw(sql, reportId).QueryRows(&list)
+	//_, err = o.Raw(sql, reportId).QueryRows(&list)
+	err = global.DEFAULT_DB.Raw(sql, reportId).Find(&list).Error
 	return
 }

models/report_chapter_type.go

@@ -1,13 +1,14 @@
 package models
 
 import (
+	"eta/eta_report/global"
 	"eta/eta_report/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 type ReportChapterType struct {
-	ReportChapterTypeId    int       `orm:"column(report_chapter_type_id);pk" description:"报告章节类型id"`
+	//ReportChapterTypeId    int       `orm:"column(report_chapter_type_id);pk" description:"报告章节类型id"`
+	ReportChapterTypeId    int       `gorm:"column:report_chapter_type_id;primaryKey" description:"报告章节类型id"`
 	ReportChapterTypeKey   string    `description:"章节key"`
 	ReportChapterTypeThumb string    `description:"H5展示的图片"`
 	BannerUrl              string    `description:"banner显示图片"`
@@ -36,8 +37,9 @@ func GetAllReportChapterTypeListByResearchType(researchType string) (list []*Rep
 	if utils.BusinessCode != utils.BusinessCodeRelease {
 		return
 	}
-	o := orm.NewOrmUsingDB("weekly")
+	//o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM report_chapter_type WHERE research_type = ?`
-	_, err = o.Raw(sql, researchType).QueryRows(&list)
+	//_, err = o.Raw(sql, researchType).QueryRows(&list)
+	err = global.DbMap[utils.DbNameWeekly].Raw(sql, researchType).Find(&list).Error
 	return
 }

models/smart_report.go

@@ -1,16 +1,17 @@
 package models
 
 import (
+	"eta/eta_report/global"
 	"eta/eta_report/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"html"
 	"time"
 )
 
 // SmartReport 智能研报
 type SmartReport struct {
-	SmartReportId       int       `orm:"column(smart_report_id);pk" description:"智能研报ID"`
+	//SmartReportId       int       `orm:"column(smart_report_id);pk" description:"智能研报ID"`
+	SmartReportId       int       `gorm:"column:smart_report_id;primaryKey" description:"智能研报ID"`
 	ReportCode          string    `description:"报告唯一编码"`
 	ClassifyIdFirst     int       `description:"一级分类ID"`
 	ClassifyNameFirst   string    `description:"一级分类名称"`
@@ -65,32 +66,36 @@ func (m *SmartReport) PrimaryId() string {
 }
 
 func (m *SmartReport) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.SmartReportId = int(id)
+	//o := orm.NewOrm()
+	//id, err := o.Insert(m)
+	//if err != nil {
+	//	return
+	//}
+	//m.SmartReportId = int(id)
+	err = global.DEFAULT_DB.Create(&m).Error
 	return
 }
 
 func (m *SmartReport) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(m, cols...)
+	err = global.DEFAULT_DB.Model(&m).Select(cols).Updates(&m).Error
 	return
 }
 
 func (m *SmartReport) GetItemById(id int) (item *SmartReport, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = o.Raw(sql, id).QueryRow(&item)
+	//err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DEFAULT_DB.Where(sql, id).First(&item).Error
 	return
 }
 
 func (m *SmartReport) GetItemByCondition(condition string, pars []interface{}) (item *SmartReport, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	//err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DEFAULT_DB.Where(sql, pars...).First(&item).Error
 	return
 }
 
@@ -196,14 +201,16 @@ type SmartReportShareDetailResp struct {
 
 // UpdateSmartReportPv 研报pv自增
 func UpdateSmartReportPv(reportId int) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE smart_report SET pv = pv + 1 WHERE smart_report_id = ?`
-	_, err = o.Raw(sql, reportId).Exec()
+	//_, err = o.Raw(sql, reportId).Exec()
+	err = global.DEFAULT_DB.Exec(sql, reportId).Error
 	return
 }
 
 type SmartReportResource struct {
-	ResourceId int       `orm:"column(resource_id);pk" description:"智能研报资源ID"`
+	//ResourceId int       `orm:"column(resource_id);pk" description:"智能研报资源ID"`
+	ResourceId int       `gorm:"column:resource_id;primaryKey" description:"智能研报资源ID"`
 	ImgUrl     string    // 图片链接
 	Style      string    // 版图样式
 	ImgName    string    // 图片名称
@@ -212,9 +219,10 @@ type SmartReportResource struct {
 }
 
 func GetResourceItemById(id int) (item *SmartReportResource, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM smart_report_resource WHERE resource_id = ? LIMIT 1`)
-	err = o.Raw(sql, id).QueryRow(&item)
+	//err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, id).First(&item).Error
 	return
 }
 

utils/config.go

@@ -11,6 +11,7 @@ var (
 	MYSQL_URL        string //数据库连接
 	MYSQL_URL_ETA    string
 	MYSQL_WEEKLY_URL string //CRM主库
+	DbDriverName     string // 数据库驱动名称
 
 	REDIS_CACHE string //缓存地址
 	//Rc          *cache.Cache //redis缓存
@@ -132,6 +133,12 @@ func init() {
 	MYSQL_URL_ETA = config["mysql_url_eta"]
 	MYSQL_WEEKLY_URL = config["mysql_url_weekly"]
 
+	// 数据库驱动名称
+	DbDriverName = config["db_driver_name"]
+	if DbDriverName == "" {
+		DbDriverName = "mysql"
+	}
+
 	REDIS_CACHE = config["beego_cache"]
 	if len(REDIS_CACHE) <= 0 {
 		panic(any("redis链接参数没有配置"))

utils/constants.go

@@ -55,3 +55,18 @@ const (
 	STORAGESOURCE_MINIO_NAME = "minio"
 	STORAGESOURCE_S3_NAME    = "s3"
 )
+
+const (
+	DbDriverByMysql = "mysql"
+	DbDriverByDm    = "dm"
+)
+
+const (
+	DbNameMaster      = "eta_master"
+	DbNameReport      = "eta_report"
+	DbNameManualIndex = "eta_manual_index"
+	DbNameIndex       = "eta_index"
+	DbNameGL          = "eta_gl"
+	DbNameAI          = "eta_ai"
+	DbNameWeekly      = "weekly_report"
+)