Merge branch 'bzq/custom_dw_mini' of eta_server/eta_chart_lib into debug

controllers/chart.go

@@ -51,14 +51,15 @@ func (this *ChartController) ChartInfoDetail() {
 		br.ErrMsg = "获取配置信息失败, Err: " + e.Error()
 		return
 	}
+	var isCollect bool
 	if source == utils.CHART_SOURCE_DW && token != "" {
-		isCollect, err := dwmini.GetMyChartIsCollect(token, uniqueCode)
+		tmpIsCollect, err := dwmini.GetMyChartIsCollect(token, uniqueCode)
 		if err != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取收藏状态失败，Err:" + err.Error()
 			return
 		}
-		resp.IsCollect = isCollect
+		isCollect = tmpIsCollect
 	}
 
 	//判断是否有缓存
@@ -70,6 +71,9 @@ func (this *ChartController) ChartInfoDetail() {
 					if conf[models.BusinessConfWatermarkChart] == "true" && conf[models.BusinessConfCompanyWatermark] != "" {
 						resp.WaterMark = conf[models.BusinessConfCompanyWatermark]
 					}
+					if isCollect {
+						resp.IsCollect = isCollect
+					}
 					br.Ret = 200
 					br.Success = true
 					br.Msg = "获取成功"
@@ -128,6 +132,9 @@ func (this *ChartController) ChartInfoDetail() {
 		br.ErrMsg = errMsg
 		return
 	}
+	if isCollect {
+		resp.IsCollect = isCollect
+	}
 
 	if conf[models.BusinessConfWatermarkChart] == "true" && conf[models.BusinessConfCompanyWatermark] != "" {
 		resp.WaterMark = conf[models.BusinessConfCompanyWatermark]