evan/tank
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ready to rename the atomic method.

Browse Source
This commit is contained in:
zicla
2019-04-25 01:51:00 +08:00
parent 53b0af2321
commit 1416344b06
3 changed files with 43 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rest/alien_controller.go
View File

@ -199,12 +199,12 @@ func (this *AlienController) FetchUploadToken(writer http.ResponseWriter, reques
dir := request.FormValue("dir")
user := this.CheckRequestUser(writer, request)
dirUuid, _ := this.matterService.GetDirUuid(user, dir)
dirMatter := this.matterService.CreateDirectories(user, dir)
mm, _ := time.ParseDuration(fmt.Sprintf("%ds", expire))
uploadToken := &UploadToken{
UserUuid: user.Uuid,
FolderUuid: dirUuid,
FolderUuid: dirMatter.Uuid,
MatterUuid: "",
ExpireTime: time.Now().Add(mm),
Filename: filename,
@ -348,7 +348,6 @@ func (this *AlienController) CrawlDirect(writer http.ResponseWriter, request *ht
//文件夹路径，以 / 开头。
dir := request.FormValue("dir")
if filename == "" {
panic("文件名必填")
} else if m, _ := regexp.MatchString(`[<>|*?/\\]`, filename); m {
@ -374,9 +373,9 @@ func (this *AlienController) CrawlDirect(writer http.ResponseWriter, request *ht
}
user := this.CheckRequestUser(writer, request)
dirUuid, dirRelativePath := this.matterService.GetDirUuid(user, dir)
dirMatter := this.matterService.CreateDirectories(user, dir)
matter := this.matterService.Crawl(url, filename, user, dirUuid, dirRelativePath, privacy)
matter := this.matterService.Crawl(url, filename, user, dirMatter.Uuid, dirMatter.Path, privacy)
return this.Success(matter)
}