Browse Source

Merge branch 'eta/2.4.5' into debug

Roc 1 week ago
parent
commit
fdc779e9a8
2 changed files with 11 additions and 8 deletions
  1. 2 0
      controllers/english_report.go
  2. 9 8
      models/english_report.go

+ 2 - 0
controllers/english_report.go

@@ -136,6 +136,8 @@ func (this *EnglishReportShareController) EnglishReportDetail() {
 	// 报告内图表授权
 	if v, ok := conf[models.BusinessConfIsOpenChartExpired]; ok {
 		if v == `true` {
+			resp.IsOpenChartExpired = true
+
 			tokenMap := make(map[string]string)
 			report.Content = services.HandleReportContent(report.Content, "add", tokenMap)
 		}

+ 9 - 8
models/english_report.go

@@ -41,14 +41,15 @@ func GetEnglishReportByCode(reportCode string) (item *EnglishReportDetail, err e
 }
 
 type EnglishReportShareDetailResp struct {
-	Report           *EnglishReportDetail `description:"报告"`
-	H5ShareEnName    string               `description:"研报分享抬头"`
-	H5ReportShareImg string               `description:"研报分享图片"`
-	WatermarkChart   string               `description:"图表是否需要水印"`
-	WatermarkReport  string               `description:"报告是否需要水印"`
-	Hz               int
-	DisclaimerEn     string `description:"免责声明"`
-	ReportLogo       string `description:"报告logo"`
+	Report             *EnglishReportDetail `description:"报告"`
+	H5ShareEnName      string               `description:"研报分享抬头"`
+	H5ReportShareImg   string               `description:"研报分享图片"`
+	WatermarkChart     string               `description:"图表是否需要水印"`
+	WatermarkReport    string               `description:"报告是否需要水印"`
+	Hz                 int
+	DisclaimerEn       string `description:"免责声明"`
+	ReportLogo         string `description:"报告logo"`
+	IsOpenChartExpired bool   `description:"是否开启图表有效期鉴权/报告禁止复制"`
 }
 
 func UpdateEnglishReportCounts(reportCode string) (err error) {