Merge branch 'eta/1.2'

controllers/report_share.go

@@ -39,6 +39,17 @@ func (this *ReportShareController) Detail() {
 	report.Content = html.UnescapeString(report.Content)
 
 	resp := new(models.ReportShareDetailResp)
+	// 免责声明
+	conf, e := models.GetBusinessConf()
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取免责声明失败, Err: " + e.Error()
+		return
+	}
+	if conf[models.BusinessConfDisclaimer] != "" {
+		resp.Disclaimer = conf[models.BusinessConfDisclaimer]
+	}
+
 	resp.Report = report
 	br.Ret = 200
 	br.Success = true

models/business_conf.go

@@ -0,0 +1,44 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"html"
+	"time"
+)
+
+const (
+	BusinessConfDisclaimer = "Disclaimer"
+)
+
+// BusinessConf 商户配置表
+type BusinessConf struct {
+	Id         int    `orm:"column(id);pk"`
+	ConfKey    string `description:"配置Key"`
+	ConfVal    string `description:"配置值"`
+	ValType    int    `description:"1-字符串；2-数值；3-字符串数组；4-富文本；"`
+	Necessary  int    `description:"是否必填：0-否；1-是"`
+	Remark     string `description:"备注"`
+	CreateTime time.Time
+}
+
+// GetBusinessConf 获取商家配置
+func GetBusinessConf() (list map[string]string, err error) {
+	list = make(map[string]string)
+
+	var items []*BusinessConf
+	o := orm.NewOrmUsingDB("eta")
+	sql := `SELECT * FROM business_conf`
+	_, err = o.Raw(sql).QueryRows(&items)
+	if err != nil {
+		return
+	}
+
+	for _, v := range items {
+		if v.ValType == 4 {
+			list[v.ConfKey] = html.UnescapeString(v.ConfVal)
+			continue
+		}
+		list[v.ConfKey] = v.ConfVal
+	}
+	return
+}

models/db.go

@@ -38,6 +38,14 @@ func init() {
 	rddpTrial, _ := orm.GetDB("rddp_trial")
 	rddpTrial.SetConnMaxLifetime(10 * time.Minute)
 
+	// ETA默认库
+	_ = 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)
 

models/report.go

@@ -227,7 +227,8 @@ func GetReportByCode(reportCode string) (item *Report, err error) {
 }
 
 type ReportShareDetailResp struct {
-	Report *Report `description:"报告"`
+	Report     *Report `description:"报告"`
+	Disclaimer string  `description:"免责声明"`
 }
 
 type PcReport struct {

utils/config.go

@@ -15,6 +15,7 @@ var (
 	RunMode        string //运行模式
 	MYSQL_URL      string //数据库连接
 	MYSQL_URL_RDDP string //数据库连接
+	MYSQL_URL_ETA  string
 	//MYSQL_URL_EDB        string
 	MYSQL_URL_RDDP_TRIAL string // ETA试用rddp库
 
@@ -88,6 +89,7 @@ func init() {
 	logs.Info(RunMode + " 模式")
 	MYSQL_URL = config["mysql_url"]
 	MYSQL_URL_RDDP = config["mysql_url_rddp"]
+	MYSQL_URL_ETA = config["mysql_url_eta"]
 	//MYSQL_URL_EDB = config["mysql_url_edb"]
 	MYSQL_URL_RDDP_TRIAL = config["mysql_url_rddp_trial"]