task 项目配置eta数据库

models/business_conf.go

@@ -37,7 +37,7 @@ func (m *BusinessConf) PrimaryId() string {
 }
 
 func (m *BusinessConf) Create() (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("eta")
 	id, err := o.Insert(m)
 	if err != nil {
 		return
@@ -50,47 +50,47 @@ func (m *BusinessConf) CreateMulti(items []*BusinessConf) (err error) {
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("eta")
 	_, err = o.InsertMulti(len(items), items)
 	return
 }
 
 func (m *BusinessConf) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("eta")
 	_, err = o.Update(m, cols...)
 	return
 }
 
 func (m *BusinessConf) Del() (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("eta")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
 	_, err = o.Raw(sql, m.Id).Exec()
 	return
 }
 
 func (m *BusinessConf) GetItemById(id int) (item *BusinessConf, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("eta")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
 	err = o.Raw(sql, id).QueryRow(&item)
 	return
 }
 
 func (m *BusinessConf) GetItemByCondition(condition string, pars []interface{}) (item *BusinessConf, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("eta")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
 	err = o.Raw(sql, pars).QueryRow(&item)
 	return
 }
 
 func (m *BusinessConf) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("eta")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	err = o.Raw(sql, pars).QueryRow(&count)
 	return
 }
 
 func (m *BusinessConf) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BusinessConf, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("eta")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -105,7 +105,7 @@ func (m *BusinessConf) GetItemsByCondition(condition string, pars []interface{},
 }
 
 func (m *BusinessConf) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BusinessConf, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("eta")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -124,7 +124,7 @@ func GetBusinessConf() (list map[string]string, err error) {
 	list = make(map[string]string)
 
 	var items []*BusinessConf
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("eta")
 	sql := `SELECT * FROM business_conf`
 	_, err = o.Raw(sql).QueryRows(&items)
 	if err != nil {
@@ -149,7 +149,7 @@ type BusinessConfUpdate struct {
 
 // UpdateBusinessConfMulti 批量修改配置
 func UpdateBusinessConfMulti(items []BusinessConfUpdate) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("eta")
 	p, err := o.Raw("UPDATE business_conf SET conf_val = ? WHERE conf_key = ?").Prepare()
 	if err != nil {
 		return

models/db.go

@@ -59,6 +59,13 @@ func init() {
 	trial_datadb, _ := orm.GetDB("weekly_trial")
 	trial_datadb.SetConnMaxLifetime(10 * time.Minute)
 
+	_ = orm.RegisterDataBase("eta", "mysql", utils.MYSQL_URL_ETA)
+	orm.SetMaxIdleConns("eta", 50)
+	orm.SetMaxOpenConns("eta", 100)
+
+	etaDb, _ := orm.GetDB("eta")
+	etaDb.SetConnMaxLifetime(10 * time.Minute)
+
 	orm.Debug = true
 	orm.DebugLog = orm.NewLog(utils.Binlog)
 
@@ -98,6 +105,9 @@ func init() {
 
 	// ETA商家数据表
 	initEtaBusiness()
+
+	// ETA商家配置表
+	initEtaBusinessConf()
 }
 
 // initCompany 注册客户信息 数据表
@@ -212,3 +222,10 @@ func initEtaBusiness() {
 		new(eta_business.EtaBusinessRemindRecord),
 	)
 }
+
+// initEtaBusinessConf ETA商家基本配置表
+func initEtaBusinessConf() {
+	orm.RegisterModel(
+		new(BusinessConf),
+	)
+}

utils/config.go

@@ -15,6 +15,7 @@ var (
 	MYSQL_URL_DATA         string
 	MYSQL_URL_GL           string
 	MYSQL_URL_WEEKLY_TRIAL string // ETA试用
+	MYSQL_URL_ETA          string
 
 	REDIS_CACHE string       //缓存地址
 	Rc          *cache.Cache //redis缓存
@@ -130,6 +131,7 @@ func init() {
 	MYSQL_URL_DATA = config["mysql_url_data"]
 	MYSQL_URL_GL = config["mysql_url_gl"]
 	MYSQL_URL_WEEKLY_TRIAL = config["mysql_url_weekly_trial"]
+	MYSQL_URL_ETA = config["mysql_url_eta"]
 
 	REDIS_CACHE = config["beego_cache"]
 	if len(REDIS_CACHE) <= 0 {