diff --git a/log.go b/log.go index ef3bc958..7e0e84b2 100644 --- a/log.go +++ b/log.go @@ -32,7 +32,7 @@ type FileLogWriter struct { rotate bool - startLock sync.Mutex //only one log can writer to the file + startLock sync.Mutex // Only one log can write to the file } type MuxWriter struct { diff --git a/router.go b/router.go index b793b2bd..e7409ecc 100644 --- a/router.go +++ b/router.go @@ -94,7 +94,8 @@ func (p *ControllerRegistor) Add(pattern string, c ControllerInterface, mappingM } } } - t := reflect.Indirect(reflect.ValueOf(c)).Type() + reflectVal := reflect.ValueOf(c) + t := reflect.Indirect(reflectVal).Type() methods := make(map[string]string) if len(mappingMethods) > 0 { semi := strings.Split(mappingMethods[0], ";") @@ -106,7 +107,7 @@ func (p *ControllerRegistor) Add(pattern string, c ControllerInterface, mappingM comma := strings.Split(colon[0], ",") for _, m := range comma { if m == "*" || inSlice(strings.ToLower(m), HTTPMETHOD) { - if _, ok := t.MethodByName(colon[1]); ok { + if val := reflectVal.MethodByName(colon[1]); val.IsValid() { methods[strings.ToLower(m)] = colon[1] } else { panic(colon[1] + " method don't exist in the controller " + t.Name()) diff --git a/template.go b/template.go index 2112f806..654bdf3f 100644 --- a/template.go +++ b/template.go @@ -23,7 +23,6 @@ func init() { beegoTplFuncMap = make(template.FuncMap) BeeTemplateExt = make([]string, 0) BeeTemplateExt = append(BeeTemplateExt, "tpl", "html") - beegoTplFuncMap["markdown"] = MarkDown beegoTplFuncMap["dateformat"] = DateFormat beegoTplFuncMap["date"] = Date beegoTplFuncMap["compare"] = Compare diff --git a/utils.go b/utils.go index 8571848d..1adebd2e 100644 --- a/utils.go +++ b/utils.go @@ -2,7 +2,6 @@ package beego import ( "fmt" - "github.com/russross/blackfriday" "html/template" "net/url" "reflect" @@ -20,14 +19,6 @@ func webTime(t time.Time) string { return ftime } -// MarkDown parses a string in MarkDown format and returns HTML. Used by the template parser as "markdown" -func MarkDown(raw string) (output template.HTML) { - input := []byte(raw) - bOutput := blackfriday.MarkdownBasic(input) - output = template.HTML(string(bOutput)) - return -} - func Substr(s string, start, length int) string { bt := []rune(s) if start < 0 {