优化代码

app/service/file.go

@@ -32,7 +32,6 @@ func (f *fileService) Upload(r *model.FileUploadRequest) {
 
 	if err = dao.XyuRoom.Where(dao.XyuRoom.Columns.RoomNum, r.RoomNum).Scan(&room); err != nil {
 		g.Log().Async().Error(err)
-		go func() { f.done <- err }()
 	}
 	// 上传操作
 	go parserURLObject.Worker(err)

packed/file/file_upload.go

@@ -175,14 +175,19 @@ func (f *ObtainFile) uploadPacked() error {
 
 // 进行解析上传操作
 func (f *ObtainFile) Worker(err error) {
+	defer func() {
+		if err != nil {
+			f.err <- err
+		} else {
+			f.ok <- true
+		}
+	}()
 	if err != nil {
 		return
 	}
-
 	// 解析课件获取课件信息
 	if err = f.fileInfo(); err != nil {
 		g.Log().Async().Error(err)
-		f.err <- err
 		return
 	}
 	g.Log().Async().Infof("file: %s file info complete", f.parser.name)
@@ -194,7 +199,6 @@ func (f *ObtainFile) Worker(err error) {
 	// 下载ZIP包
 	if err = http.Download(downloadZipLink, f.parser.splitTempZipLink()); err != nil {
 		g.Log().Async().Error(err)
-		f.err <- err
 		return
 	}
 	// 清理ZIP包
@@ -204,17 +208,14 @@ func (f *ObtainFile) Worker(err error) {
 	// 解析ZIP包并上传图片到OSS
 	if err = f.uploadPicture(); err != nil {
 		g.Log().Async().Error(err)
-		f.err <- err
 		return
 	}
 	// 上传packed.json到oss
 	if err = f.uploadPacked(); err != nil {
 		g.Log().Async().Error(err)
-		f.err <- err
 		return
 	}
 	g.Log().Async().Infof("filename: %s upload success!", f.parser.name)
-	f.ok <- true
 }
 
 func (f *ObtainFile) FileName() string {