Merge branch 'feature/yb11.10_rai_report' into debug

# Conflicts:
#	config/config.go
#	models/tables/rddp/report/query.go
#	services/report/report.go

config/config.go

@@ -116,4 +116,5 @@ type System struct {
 
 type RaiReportLib struct {
 	ServerUrl string `mapstructure:"server_url" json:"server_url" yaml:"server_url" description:"权益报告查看地址"`
+	Token     string `mapstructure:"token" json:"token" yaml:"token" description:"权益报告查看token"`
 }

models/response/pc/report.go

@@ -166,7 +166,7 @@ func GetRaiRecommendList(reportId, firstId, secondId, thirdId int, publishTime t
 	if len(beforeItems) < 3 {
 		var afterItems []*Report
 		remainCount := 3 - len(beforeItems)
-		afterSql := `SELECT id,title,classify_name_first,classify_name_second, state FROM report WHERE state=2 AND id<>? AND classify_id_first=? AND classify_id_second=? AND classify_id_third=? 
+		afterSql := `SELECT id,title,classify_name_first,classify_name_second, state, rai_report_id FROM report WHERE state=2 AND id<>? AND classify_id_first=? AND classify_id_second=? AND classify_id_third=? 
 			AND publish_time > ? ORDER BY publish_time ASC, id ASC LIMIT ?`
 		err = global.MYSQL["rddp"].Raw(afterSql, reportId, firstId, secondId, thirdId, publishTime, remainCount).Find(&afterItems).Error
 		if err != nil {

models/tables/rddp/report/query.go

@@ -142,7 +142,7 @@ func GetByReportId(id int) (item *Report, err error) {
 func GetByReportIds(ids []int) (list []*Report, err error) {
 	err = global.MYSQL["rddp"].Model(Report{}).
 		Where("id in (?) and state IN (2, 6) and is_public_publish=1", ids).
-		Select("id, create_time,rai_report_id").
+		Select("id, create_time, rai_report_id").
 		Scan(&list).Error
 	if err == utils.ErrNoRow {
 		err = nil

services/report/report.go

@@ -623,7 +623,7 @@ func GetReportDetail(userinfo user.UserInfo, reportId int) (reportDetail respons
 	reportDetail.ReportShowType = int(firstClassify.ShowType)
 	reportDetail.ReportDetailShowType = int(minClassify.ReportDetailShowType)
 	if reportInfo.RaiReportId > 0 {
-		reportDetail.RaiReportUrl = fmt.Sprintf("%s/v2/articles/%d", global.CONFIG.RaiReportLib.ServerUrl, reportInfo.RaiReportId)
+		reportDetail.RaiReportUrl = fmt.Sprintf("%s/v2/articles/%d?token=%s", global.CONFIG.RaiReportLib.ServerUrl, reportInfo.RaiReportId, global.CONFIG.RaiReportLib.Token)
 	}
 
 	// 如果分类配置是列表展示，那么就移除content内容