diff --git a/app/controllers/BlogController.go b/app/controllers/BlogController.go index 0df1482..a1219d1 100644 --- a/app/controllers/BlogController.go +++ b/app/controllers/BlogController.go @@ -6,7 +6,7 @@ import ( // "encoding/json" "fmt" "github.com/leanote/leanote/app/info" - . "github.com/leanote/leanote/app/lea" + // . "github.com/leanote/leanote/app/lea" "github.com/leanote/leanote/app/lea/blog" "gopkg.in/mgo.v2/bson" // "github.com/leanote/leanote/app/types" @@ -609,7 +609,7 @@ func (c Blog) Post(userIdOrEmail, noteId string) (re revel.Result) { hasDomain, userBlog := c.domain() defer func() { if err := recover(); err != nil { - Log(err) + // Log(err) re = c.e404(userBlog.ThemePath) } }() diff --git a/app/controllers/NoteController.go b/app/controllers/NoteController.go index 1cb434e..6984c49 100644 --- a/app/controllers/NoteController.go +++ b/app/controllers/NoteController.go @@ -234,20 +234,21 @@ func (c Note) UpdateNoteOrContent(noteOrContent info.NoteOrContent) revel.Result } //------------- - afterContentUsn := 0 - contentOk := false - contentMsg := "" + // afterContentUsn := 0 + // contentOk := false + // contentMsg := "" if c.Has("Content") { // noteService.UpdateNoteContent(noteOrContent.UserId, c.GetUserId(), // noteOrContent.NoteId, noteOrContent.Content, noteOrContent.Abstract) - contentOk, contentMsg, afterContentUsn = noteService.UpdateNoteContent(c.GetUserId(), + // contentOk, contentMsg, afterContentUsn = + noteService.UpdateNoteContent(c.GetUserId(), noteOrContent.NoteId, noteOrContent.Content, noteOrContent.Abstract, needUpdateNote, -1, time.Now()) } - Log(afterContentUsn) - Log(contentOk) - Log(contentMsg) + // Log("usn", "afterContentUsn", afterContentUsn + "") + // Log(contentOk) + // Log(contentMsg) return c.RenderJSON(true) } diff --git a/app/controllers/api/ApiNoteController.go b/app/controllers/api/ApiNoteController.go index 4ee73c6..e75e455 100644 --- a/app/controllers/api/ApiNoteController.go +++ b/app/controllers/api/ApiNoteController.go @@ -178,7 +178,7 @@ func (c ApiNote) fixPostNotecontent(noteOrContent *info.ApiNote) { // "/api/file/getImage?fileId="+file.FileId, -1) } else { reg, _ := regexp.Compile(`https*://[^/]*?/api/file/getAttach\?fileId=`+file.LocalFileId) - Log(reg) + // Log(reg) noteOrContent.Content = reg.ReplaceAllString(noteOrContent.Content, `/api/file/getAttach?fileId=`+file.FileId) /* noteOrContent.Content = strings.Replace(noteOrContent.Content, diff --git a/app/lea/Debug.go b/app/lea/Debug.go index 8472f61..a0892cd 100644 --- a/app/lea/Debug.go +++ b/app/lea/Debug.go @@ -6,21 +6,17 @@ import ( "github.com/revel/revel" ) -func Log(i ...interface{}) { - revel.INFO.Println(i...) +func Log(msg string, i ...interface{}) { + revel.AppLog.Info(msg, i...) } -func LogW(i ...interface{}) { - revel.WARN.Println(i...) -} - -func Log1(key, i interface{}) { - revel.INFO.Println(key, i) +func LogW(msg string, i ...interface{}) { + revel.AppLog.Warn(msg, i...) } func LogJ(i interface{}) { b, _ := json.MarshalIndent(i, "", " ") - revel.INFO.Println(string(b)) + revel.AppLog.Info(string(b)) } // 为test用 diff --git a/app/lea/Email.go b/app/lea/Email.go index ab9fd88..cf684dd 100644 --- a/app/lea/Email.go +++ b/app/lea/Email.go @@ -79,7 +79,6 @@ func SendEmailOld(to, subject, body string) bool { err := smtp.SendMail(host+":"+port, auth, username, send_to, msg) if err != nil { - Log(err) return false } return true diff --git a/app/lea/File.go b/app/lea/File.go index 8b54944..c0e2fa1 100644 --- a/app/lea/File.go +++ b/app/lea/File.go @@ -183,7 +183,6 @@ func PutFileStrContent(path, content string) bool { // Log(path) if err1 != nil { - Log(err1) return false } return true diff --git a/app/lea/Util.go b/app/lea/Util.go index b2ea077..772950c 100644 --- a/app/lea/Util.go +++ b/app/lea/Util.go @@ -400,9 +400,6 @@ func FixFilename(filename string) string { func IsValidTime(t time.Time) bool { if t.Year() > 20 { now := time.Now() - Log("------") - Log(t) - Log(now) if t.Before(now) { return true } diff --git a/app/lea/i18n/i18n.go b/app/lea/i18n/i18n.go index 137b4f9..34accf1 100644 --- a/app/lea/i18n/i18n.go +++ b/app/lea/i18n/i18n.go @@ -178,13 +178,13 @@ func init() { func I18nFilter(c *revel.Controller, fc []revel.Filter) { if foundCookie, cookieValue := hasLocaleCookie(c.Request); foundCookie { - revel.TRACE.Printf("Found locale cookie value: %s", cookieValue) + // revel.TRACE.Printf("Found locale cookie value: %s", cookieValue) setCurrentLocaleControllerArguments(c, cookieValue) } else if foundHeader, headerValue := hasAcceptLanguageHeader(c.Request); foundHeader { - revel.TRACE.Printf("Found Accept-Language header value: %s", headerValue) + // revel.TRACE.Printf("Found Accept-Language header value: %s", headerValue) setCurrentLocaleControllerArguments(c, headerValue) } else { - revel.TRACE.Println("Unable to find locale in cookie or header, using empty string") + // revel.TRACE.Println("Unable to find locale in cookie or header, using empty string") setCurrentLocaleControllerArguments(c, "") } fc[0](c, fc[1:]) @@ -215,7 +215,7 @@ func hasLocaleCookie(request *revel.Request) (bool, string) { if cookie, error := request.Cookie(name); error == nil { return true, cookie.GetValue() } else { - revel.TRACE.Printf("Unable to read locale cookie with name '%s': %s", name, error.Error()) + // revel.TRACE.Printf("Unable to read locale cookie with name '%s': %s", name, error.Error()) } } diff --git a/app/lea/netutil/NetUtil.go b/app/lea/netutil/NetUtil.go index 817ce6b..97486a0 100644 --- a/app/lea/netutil/NetUtil.go +++ b/app/lea/netutil/NetUtil.go @@ -53,7 +53,6 @@ func WriteUrl(url string, toPath string) (length int64, newFilename, path string func GetContent(url string) (content []byte, err error) { var resp *http.Response resp, err = http.Get(url) - Log(err) if resp != nil && resp.Body != nil { defer resp.Body.Close() } else { @@ -65,7 +64,6 @@ func GetContent(url string) (content []byte, err error) { var buf []byte buf, err = ioutil.ReadAll(resp.Body) if err != nil { - Log(err) return } diff --git a/app/lea/route/Route.go b/app/lea/route/Route.go index 19b70f4..b92b07b 100644 --- a/app/lea/route/Route.go +++ b/app/lea/route/Route.go @@ -3,7 +3,7 @@ package route import ( "github.com/leanote/leanote/app/db" "github.com/revel/revel" - . "github.com/leanote/leanote/app/lea" + // . "github.com/leanote/leanote/app/lea" "net/url" "strings" ) @@ -25,7 +25,7 @@ func RouterFilter(c *revel.Controller, fc []revel.Filter) { return } - Log("---------" + route.Action + " " + path) + // Log("---------" + route.Action + " " + path) // The route may want to explicitly return a 404. if route.Action == "404" { diff --git a/app/service/NoteService.go b/app/service/NoteService.go index 304e278..b1c54c8 100644 --- a/app/service/NoteService.go +++ b/app/service/NoteService.go @@ -1106,7 +1106,7 @@ func (this *NoteService) FixContent(content string, isMarkdown bool) string { reg2, _ = regexp.Compile("]+?)(" + eachPattern["src"] + `=['"]*` + baseUrlPattern + eachPattern["middle"] + `\?` + eachPattern["param"] + `=([a-z0-9A-Z]{24})["']*)[^>]*>`) } - Log(reg2) + // Log(reg2) content = reg.ReplaceAllStringFunc(content, func(str string) string { // str=这样的 diff --git a/app/service/NotebookService.go b/app/service/NotebookService.go index 4974e36..d7f9c2b 100644 --- a/app/service/NotebookService.go +++ b/app/service/NotebookService.go @@ -360,8 +360,8 @@ func (this *NotebookService) DragNotebooks(userId string, curNotebookId string, func (this *NotebookService) ReCountNotebookNumberNotes(notebookId string) bool { notebookIdO := bson.ObjectIdHex(notebookId) count := db.Count(db.Notes, bson.M{"NotebookId": notebookIdO, "IsTrash": false, "IsDeleted": false}) - Log(count) - Log(notebookId) + // Log(count) + // Log(notebookId) return db.UpdateByQField(db.Notebooks, bson.M{"_id": notebookIdO}, "NumberNotes", count) } diff --git a/app/service/SessionService.go b/app/service/SessionService.go index 6553e4c..b46b1cd 100644 --- a/app/service/SessionService.go +++ b/app/service/SessionService.go @@ -3,7 +3,7 @@ package service import ( "github.com/leanote/leanote/app/db" "github.com/leanote/leanote/app/info" - . "github.com/leanote/leanote/app/lea" + // . "github.com/leanote/leanote/app/lea" "gopkg.in/mgo.v2/bson" "time" // "strings" @@ -66,10 +66,10 @@ func (this *SessionService) GetCaptcha(sessionId string) string { } func (this *SessionService) SetCaptcha(sessionId, captcha string) bool { this.Get(sessionId) - Log(sessionId) - Log(captcha) + // Log(sessionId) + // Log(captcha) ok := this.Update(sessionId, "Captcha", captcha) - Log(ok) + // Log(ok) return ok } diff --git a/app/service/ThemeService.go b/app/service/ThemeService.go index 2e40c9c..ae2c92a 100644 --- a/app/service/ThemeService.go +++ b/app/service/ThemeService.go @@ -311,7 +311,7 @@ func (this *ThemeService) UpdateTplContent(userId, themeId, filename, content st basePath := this.GetThemeAbsolutePath(userId, themeId) path := basePath + "/" + filename if strings.Contains(filename, ".html") { - Log(">>") + // Log(">>") if ok, msg = this.ValidateTheme(basePath, filename, content); ok { // 模板 if ok, msg = this.mustTpl(filename, content); ok { @@ -359,7 +359,7 @@ func (this *ThemeService) mustTpl(filename, content string) (ok bool, msg string defer func() { if err := recover(); err != nil { ok = false - Log(err) + // Log(err) msg = fmt.Sprintf("%v", err) } }() @@ -405,7 +405,7 @@ func (this *ThemeService) ExportTheme(userId, themeId string) (ok bool, path str theme := this.GetThemeById(themeId) // 打包 // 验证路径, 别把整个项目打包了 - Log(theme.Path) + // Log(theme.Path) if theme.Path == "" || (!strings.HasPrefix(theme.Path, "public/upload") && !strings.HasPrefix(theme.Path, "public/blog/themes")) || @@ -417,12 +417,12 @@ func (this *ThemeService) ExportTheme(userId, themeId string) (ok bool, path str targetPath := revel.BasePath + "/public/upload/" + userId + "/tmp" err := os.MkdirAll(targetPath, 0755) if err != nil { - Log(err) + // Log(err) return } targetName := targetPath + "/" + theme.Name + ".zip" - Log(sourcePath) - Log(targetName) + // Log(sourcePath) + // Log(targetName) ok = archive.Zip(sourcePath, targetName) if !ok { return @@ -445,7 +445,7 @@ func (this *ThemeService) ImportTheme(userId, path string) (ok bool, msg string) } if ok, msg = archive.Unzip(path, targetPath); !ok { DeleteFile(targetPath) - Log("oh no") + // Log("oh no") return } @@ -558,8 +558,8 @@ func (this *ThemeService) InstallTheme(userId, themeId string) (ok bool) { // 验证主题是否全法, 存在循环引用? // filename, newContent 表示在修改模板时要判断模板修改时是否有错误 func (this *ThemeService) ValidateTheme(path string, filename, newContent string) (ok bool, msg string) { - Log("theme Path") - Log(path) + // Log("theme Path") + // Log(path) // 建立一个有向图 // 将该path下的所有文件提出, 得到文件的引用情况 files := ListDir(path) @@ -613,9 +613,9 @@ func (this *ThemeService) ValidateTheme(path string, filename, newContent string for _, includes := range finds { include := includes[1] includeIndex, has := fileIndexMap[include] - Log(includeIndex) - Log("??") - Log(has) + // Log(includeIndex) + // Log("??") + // Log(has) if has { vector[thisIndex][includeIndex] = 1 } diff --git a/app/service/UserService.go b/app/service/UserService.go index eebf479..528c260 100644 --- a/app/service/UserService.go +++ b/app/service/UserService.go @@ -485,7 +485,7 @@ func (this *UserService) GetAllUserByFilter(userFilterEmail, userFilterWhiteList users := []info.User{} q := db.Users.Find(query) q.All(&users) - Log(len(users)) + // Log(len(users)) return users } diff --git a/conf/routes b/conf/routes index ccedc74..fa8f9be 100644 --- a/conf/routes +++ b/conf/routes @@ -128,6 +128,8 @@ GET /upload/*filepath Static.Serve("public/upload") # the prefix of member's controllername is "Member" * /member MemberIndex.Index * /member/index MemberIndex.Index + +# 不知道为什么, group就是不行 member/blog可以 * /member/group/index MemberGroup.Index * /member/group/addGroup MemberGroup.AddGroup * /member/group/updateGroupTitle MemberGroup.UpdateGroupTitle