增加免责声明

controllers/common_info.go

@@ -32,14 +32,21 @@ func (this *CommonController) GetDisclaimer() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	disclaimerList, err := models.GetBusinessConfByKeys(disclaimerMap)
+	configList, err := models.GetBusinessConf()
 	if err != nil {
 		br.Msg = "获取免责声明失败"
 		br.ErrMsg = "获取免责声明失败,Err:" + err.Error()
 		return
 	}
-
-	br.Data = disclaimerList
+	var list []string
+	for _, v := range disclaimerMap {
+		if configList[v] == "" {
+			br.Msg = "获取免责声明失败"
+			br.ErrMsg = "获取免责声明失败,Err:" + err.Error()
+		}
+		list = append(list, configList[v])
+	}
+	br.Data = list
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "刷新成功"

models/business_conf.go

@@ -59,26 +59,6 @@ func GetBusinessConf() (list map[string]string, err error) {
 	}
 	return
 }
-func GetBusinessConfByKeys(key []string) (list map[string]string, err error) {
-	list = make(map[string]string)
-	if len(key) == 0 {
-		return
-	}
-	var items []*BusinessConf
-	sql := `SELECT * FROM business_conf WHERE conf_key IN ? `
-	err = global.DbMap[utils.DbNameMaster].Raw(sql, key).Find(&items).Error
-	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
-}
 
 type Report2ImgReplace struct {
 	IsReplace      bool   `description:"是否替换"`

routers/router.go

@@ -49,6 +49,10 @@ func init() {
 				&controllers.EtaForumChartController{},
 			),
 		),
-	)
+		web.NSNamespace("/common",
+			web.NSInclude(
+				&controllers.CommonController{},
+			),
+		))
 	web.AddNamespace(ns)
 }