Commit 04d08b7a by Li Feifei

更改结构体字段

parent e1faaea6
Pipeline #15888 passed with stages
in 39 seconds
...@@ -13,7 +13,7 @@ type ( ...@@ -13,7 +13,7 @@ type (
FileUploadRequest struct { FileUploadRequest struct {
RoomNum string `p:"room_num" v:"required#房间号不能为空"` RoomNum string `p:"room_num" v:"required#房间号不能为空"`
Name string `p:"name" v:"required#课件名称不能为空"` Name string `p:"name" v:"required#课件名称不能为空"`
Nickanem string `p:"nickname" v:"required#用户昵称不能为空"` NickName string `p:"nickname" v:"required#用户昵称不能为空"`
Type int `p:"type"` Type int `p:"type"`
Url string `p:"url" v:"required#上传课件地址不能为空"` Url string `p:"url" v:"required#上传课件地址不能为空"`
Uuid string `p:"uuid" v:"required#上传者UUID不能为空"` Uuid string `p:"uuid" v:"required#上传者UUID不能为空"`
......
...@@ -179,18 +179,22 @@ func (f *ObtainFile) splitDownloadLink() string { ...@@ -179,18 +179,22 @@ func (f *ObtainFile) splitDownloadLink() string {
f.parser.dataPath()) f.parser.dataPath())
} }
func (f *ObtainFile) deferWorker(err error) {
// 清理ZIP包
_ = os.Remove(f.parser.splitTempZipLink())
// 通知
if err != nil {
g.Log().Async().Error(err)
f.err <- err
return
}
f.ok <- true
}
// 进行解析上传操作 // 进行解析上传操作
func (f *ObtainFile) Worker(err error) { func (f *ObtainFile) Worker(err error) {
defer func() { defer func() {
// 清理ZIP包 f.deferWorker(err)
_ = os.Remove(f.parser.splitTempZipLink())
// 通知
if err != nil {
g.Log().Async().Error(err)
f.err <- err
return
}
f.ok <- true
}() }()
if err != nil { if err != nil {
return return
...@@ -247,7 +251,7 @@ func (f *ObtainFile) Success(roomID int) { ...@@ -247,7 +251,7 @@ func (f *ObtainFile) Success(roomID int) {
"link": strings.Replace(f.parser.url, ossIntranetLink, uploadFileLinkHost, -1), "link": strings.Replace(f.parser.url, ossIntranetLink, uploadFileLinkHost, -1),
"private": "1", "private": "1",
"time": gtime.Datetime(), "time": gtime.Datetime(),
"nickname": f.R.Nickanem, "nickname": f.R.NickName,
"uuid": f.R.Uuid, "uuid": f.R.Uuid,
"room_id": roomID, "room_id": roomID,
"is_courseware" : 1, "is_courseware" : 1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment