Merge branch 'feature/eta1.0.0' into debug

controllers/english_report/report.go

@@ -677,6 +677,10 @@ func (this *EnglishReportController) PrePublishReport() {
 		br.Msg = "发布时间不允许选择过去时间"
 		return
 	}
+	if prePublishTime.Before(time.Now().Add(2 * time.Minute)) {
+		br.Msg = "发布时间距离当前时间太近了"
+		return
+	}
 	report, err := models.GetEnglishReportById(reportId)
 	if err != nil {
 		br.Msg = "获取报告信息失败"

controllers/report.go

@@ -3109,6 +3109,10 @@ func (this *ReportController) PrePublishReport() {
 		br.Msg = "发布时间不允许选择过去时间"
 		return
 	}
+	if prePublishTime.Before(time.Now().Add(2 * time.Minute)) {
+		br.Msg = "发布时间距离当前时间太近了"
+		return
+	}
 	report, err := models.GetReportById(reportId)
 	if err != nil {
 		br.Msg = "获取报告信息失败"