瀏覽代碼

fix: 研报上传图片

hsun 11 月之前
父節點
當前提交
b30b4fd768
共有 2 個文件被更改,包括 12 次插入23 次删除
  1. 3 14
      controllers/report.go
  2. 9 9
      routers/commentsRouter.go

+ 3 - 14
controllers/report.go

@@ -1227,16 +1227,7 @@ func (this *ReportController) SaveReportContent() {
 // @Param   File   query   file  true       "文件"
 // @Success 200 上传成功
 // @router /uploadImg [post]
-func (this *ReportCommonController) UploadImg() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
+func (this *ReportUploadCommonController) UploadImg() {
 	var err error
 	defer func() {
 		if err != nil {
@@ -1254,14 +1245,12 @@ func (this *ReportCommonController) UploadImg() {
 	// 不依赖于文件扩展名检查文件格式
 	fileData, e := ioutil.ReadAll(f)
 	if e != nil {
-		br.Msg = "上传失败"
-		br.ErrMsg = "读取文件失败, Err: " + e.Error()
+		err = fmt.Errorf("读取文件失败, Err: %s", e.Error())
 		return
 	}
 	pass := filetype.IsImage(fileData)
 	if !pass {
-		br.Msg = "文件格式有误"
-		br.ErrMsg = "文件格式有误"
+		err = fmt.Errorf("文件格式有误")
 		return
 	}
 

+ 9 - 9
routers/commentsRouter.go

@@ -7054,15 +7054,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_api/controllers:ReportCommonController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:ReportCommonController"],
-        beego.ControllerComments{
-            Method: "UploadImg",
-            Router: `/uploadImg`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_api/controllers:ReportController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:ReportController"],
         beego.ControllerComments{
             Method: "CheckDayWeekReportChapterVideo",
@@ -7414,6 +7405,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers:ReportUploadCommonController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:ReportUploadCommonController"],
+        beego.ControllerComments{
+            Method: "UploadImg",
+            Router: `/uploadImg`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers:ResearchGroupController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:ResearchGroupController"],
         beego.ControllerComments{
             Method: "GetAdminResearchGroup",