Merge branch 'feature/eta_2.5.4_report_free_layout' of eta_server/eta_chart_lib into master

controllers/common_info.go

@@ -0,0 +1,48 @@
+package controllers
+
+import (
+	"eta/eta_chart_lib/models"
+)
+
+// CommonController excel表格
+type CommonController struct {
+	BaseAuthController
+}
+
+const (
+	Disclaimer   = "Disclaimer"
+	DisclaimerEn = "DisclaimerEn"
+)
+
+var (
+	disclaimerMap = []string{
+		Disclaimer, DisclaimerEn,
+	}
+)
+
+// GetDisclaimer
+// @Title 获取免责声明
+// @Description 获取免责声明
+// @Success 200 {object}
+// @router /disclaimer [get]
+func (this *CommonController) GetDisclaimer() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	disclaimerList, err := models.GetBusinessConfByKeys(disclaimerMap)
+	if err != nil {
+		br.Msg = "获取免责声明失败"
+		br.ErrMsg = "获取免责声明失败,Err:" + err.Error()
+		return
+	}
+
+	br.Data = disclaimerList
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "刷新成功"
+}

routers/commentsRouter.go

@@ -88,6 +88,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:CommonController"] = append(beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:CommonController"],
+        beego.ControllerComments{
+            Method: "GetDisclaimer",
+            Router: `/disclaimer`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:EtaForumChartController"] = append(beego.GlobalControllerRouter["eta/eta_chart_lib/controllers:EtaForumChartController"],
         beego.ControllerComments{
             Method: "CommonChartInfoDetailFromUniqueCode",

routers/router.go

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