xuemingqiang/leanote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compatible with revel 0.18

Browse Source
This commit is contained in:
lealife
2017-11-30 18:10:59 +08:00
parent 430744a324
commit c6937fd184
11 changed files with 152 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/controllers/AttachController.go
View File

@ -46,14 +46,17 @@ func (c Attach) uploadAttach(noteId string) (re info.Re) {
return re
}
file, handel, err := c.Request.FormFile("file")
if err != nil {
return re
}
defer file.Close()
var data []byte
c.Params.Bind(&data, "file")
data, err := ioutil.ReadAll(file)
if err != nil {
// file, handel, err := c.Request.FormFile("file")
// if err != nil {
// return re
// }
// defer file.Close()
// data, err := ioutil.ReadAll(file)
if data == nil || len(data) == 0 {
return re
}
// > 5M?
@ -71,10 +74,13 @@ func (c Attach) uploadAttach(noteId string) (re info.Re) {
newGuid := NewGuid()
filePath := "files/" + GetRandomFilePath(c.GetUserId(), newGuid) + "/attachs"
dir := revel.BasePath + "/" + filePath
err = os.MkdirAll(dir, 0755)
err := os.MkdirAll(dir, 0755)
if err != nil {
return re
}
handel := c.Params.Files["file"][0]
// 生成新的文件名
filename := handel.Filename
_, ext := SplitFilename(filename) // .doc

2
app/controllers/BlogController.go
View File

@ -77,7 +77,7 @@ func (c Blog) e404(themePath string) revel.Result {
// life.leanote.com
// lealife.com
func (c Blog) domain() (ok bool, userBlog info.UserBlog) {
host := c.Request.Request.Host // a.cc.com:9000
host := c.Request.Host // a.cc.com:9000
hostArr := strings.Split(host, ".")
if strings.Contains(host, configService.GetDefaultDomain()) {
// 有二级域名 a.leanoe.com 3个

4
app/controllers/CaptchaController.go
View File

@ -14,6 +14,7 @@ import (
// "path"
// "strconv"
"net/http"
"io"
)
// 验证码服务
@ -30,7 +31,8 @@ func (r Ca) Apply(req *revel.Request, resp *revel.Response) {
func (c Captcha) Get() revel.Result {
c.Response.ContentType = "image/png"
image, str := captcha.Fetch()
image.WriteTo(c.Response.Out)
out := io.Writer(c.Response.GetWriter())
image.WriteTo(out)
sessionId := c.Session["_ID"]
// LogJ(c.Session)

34
app/controllers/FileController.go
View File

@ -97,11 +97,27 @@ func (c File) uploadImage(from, albumId string) (re info.Re) {
re.Ok = Ok
}()
file, handel, err := c.Request.FormFile("file")
if err != nil {
// file, handel, err := c.Request.FormFile("file")
// if err != nil {
// return re
// }
// defer file.Close()
var data []byte
c.Params.Bind(&data, "file")
handel := c.Params.Files["file"][0]
if data == nil || len(data) == 0 {
return re
}
defer file.Close()
// file, handel, err := c.Request.FormFile("file")
// if err != nil {
// return re
// }
// defer file.Close()
// data, err := ioutil.ReadAll(file)
// 生成上传路径
newGuid := NewGuid()
@ -116,7 +132,7 @@ func (c File) uploadImage(from, albumId string) (re info.Re) {
}
dir := revel.BasePath + "/" + fileUrlPath
err = os.MkdirAll(dir, 0755)
err := os.MkdirAll(dir, 0755)
if err != nil {
return re
}
@ -136,11 +152,11 @@ func (c File) uploadImage(from, albumId string) (re info.Re) {
}
filename = newGuid + ext
data, err := ioutil.ReadAll(file)
if err != nil {
LogJ(err)
return re
}
// data, err := ioutil.ReadAll(file)
// if err != nil {
// LogJ(err)
// return re
// }
var maxFileSize float64
if from == "logo" {

46
app/controllers/api/ApiBaseController.go
View File

@ -53,16 +53,23 @@ func (c ApiBaseContrller) uploadAttach(name string, noteId string) (ok bool, msg
}
*/
file, handel, err := c.Request.FormFile(name)
if err != nil {
var data []byte
c.Params.Bind(&data, name)
handel := c.Params.Files[name][0]
if data == nil || len(data) == 0 {
return
}
defer file.Close()
data, err := ioutil.ReadAll(file)
if err != nil {
return
}
// file, handel, err := c.Request.FormFile(name)
// if err != nil {
// return
// }
// defer file.Close()
// data, err := ioutil.ReadAll(file)
// if err != nil {
// return
// }
// > 5M?
maxFileSize := configService.GetUploadSize("uploadAttachSize")
if maxFileSize <= 0 {
@ -79,7 +86,7 @@ func (c ApiBaseContrller) uploadAttach(name string, noteId string) (ok bool, msg
filePath := "files/" + GetRandomFilePath(userId, newGuid) + "/attachs"
dir := revel.BasePath + "/" + filePath
err = os.MkdirAll(dir, 0755)
err := os.MkdirAll(dir, 0755)
if err != nil {
return
}
@ -122,11 +129,18 @@ func (c ApiBaseContrller) upload(name string, noteId string, isAttach bool) (ok
if isAttach {
return c.uploadAttach(name, noteId)
}
file, handel, err := c.Request.FormFile(name)
if err != nil {
// file, handel, err := c.Request.FormFile(name)
// if err != nil {
// return
// }
// defer file.Close()
var data []byte
c.Params.Bind(&data, name)
handel := c.Params.Files[name][0]
if data == nil || len(data) == 0 {
return
}
defer file.Close()
newGuid := NewGuid()
// 生成上传路径
@ -135,7 +149,7 @@ func (c ApiBaseContrller) upload(name string, noteId string, isAttach bool) (ok
fileUrlPath := "files/" + GetRandomFilePath(userId, newGuid) + "/images"
dir := revel.BasePath + "/" + fileUrlPath
err = os.MkdirAll(dir, 0755)
err := os.MkdirAll(dir, 0755)
if err != nil {
return
}
@ -148,10 +162,10 @@ func (c ApiBaseContrller) upload(name string, noteId string, isAttach bool) (ok
// }
filename = newGuid + ext
data, err := ioutil.ReadAll(file)
if err != nil {
return
}
// data, err := ioutil.ReadAll(file)
// if err != nil {
// return
// }
maxFileSize := configService.GetUploadSize("uploadImageSize")
if maxFileSize <= 0 {

25
app/controllers/api/ApiUserController.go
View File

@ -104,16 +104,23 @@ func (c ApiUser) uploadImage() (ok bool, msg, url string) {
var fileUrlPath = ""
ok = false
file, handel, err := c.Request.FormFile("file")
if err != nil {
var data []byte
c.Params.Bind(&data, "file")
handel := c.Params.Files["file"][0]
if data == nil || len(data) == 0 {
return
}
defer file.Close()
// file, handel, err := c.Request.FormFile("file")
// if err != nil {
// return
// }
// defer file.Close()
// 生成上传路径
fileUrlPath = "public/upload/" + c.getUserId() + "/images/logo"
dir := revel.BasePath + "/" + fileUrlPath
err = os.MkdirAll(dir, 0755)
err := os.MkdirAll(dir, 0755)
if err != nil {
return
}
@ -129,11 +136,11 @@ func (c ApiUser) uploadImage() (ok bool, msg, url string) {
}
filename = NewGuid() + ext
data, err := ioutil.ReadAll(file)
if err != nil {
LogJ(err)
return
}
// data, err := ioutil.ReadAll(file)
// if err != nil {
// LogJ(err)
// return
// }
// > 5M?
if len(data) > 5*1024*1024 {

50
app/controllers/member/MemberBlogController.go
View File

@ -351,14 +351,21 @@ func (c MemberBlog) uploadImage(themeId string) (re info.Re) {
re.Ok = Ok
}()
file, handel, err := c.Request.FormFile("file")
if err != nil {
var data []byte
c.Params.Bind(&data, "file")
handel := c.Params.Files["file"][0]
if data == nil || len(data) == 0 {
return re
}
defer file.Close()
// file, handel, err := c.Request.FormFile("file")
// if err != nil {
// return re
// }
// defer file.Close()
// 生成上传路径
dir := themeService.GetThemeAbsolutePath(c.GetUserId(), themeId) + "/images"
err = os.MkdirAll(dir, 0755)
err := os.MkdirAll(dir, 0755)
if err != nil {
return re
}
@ -374,11 +381,11 @@ func (c MemberBlog) uploadImage(themeId string) (re info.Re) {
}
filename = filename
data, err := ioutil.ReadAll(file)
if err != nil {
LogJ(err)
return re
}
// data, err := ioutil.ReadAll(file)
// if err != nil {
// LogJ(err)
// return re
// }
// > 2M?
if len(data) > 5*1024*1024 {
@ -441,17 +448,24 @@ func (c MemberBlog) ExportTheme(themeId string) revel.Result {
func (c MemberBlog) ImportTheme() revel.Result {
re := info.NewRe()
file, handel, err := c.Request.FormFile("file")
if err != nil {
re.Msg = fmt.Sprintf("%v", err)
var data []byte
c.Params.Bind(&data, "file")
handel := c.Params.Files["file"][0]
if data == nil || len(data) == 0 {
return c.RenderJSON(re)
}
defer file.Close()
// file, handel, err := c.Request.FormFile("file")
// if err != nil {
// re.Msg = fmt.Sprintf("%v", err)
// return c.RenderJSON(re)
// }
// defer file.Close()
// 生成上传路径
userId := c.GetUserId()
dir := revel.BasePath + "/public/upload/" + userId + "/tmp"
err = os.MkdirAll(dir, 0755)
err := os.MkdirAll(dir, 0755)
if err != nil {
re.Msg = fmt.Sprintf("%v", err)
return c.RenderJSON(re)
@ -467,10 +481,10 @@ func (c MemberBlog) ImportTheme() revel.Result {
}
filename = filename
data, err := ioutil.ReadAll(file)
if err != nil {
return c.RenderJSON(re)
}
// data, err := ioutil.ReadAll(file)
// if err != nil {
// return c.RenderJSON(re)
// }
// > 10M?
if len(data) > 10*1024*1024 {