mirror of
https://github.com/fatedier/frp.git
synced 2026-03-19 08:19:14 +08:00
remove package github.com/docopt/docopt-go
This commit is contained in:
4
vendor/github.com/fatedier/beego/controller.go
generated
vendored
4
vendor/github.com/fatedier/beego/controller.go
generated
vendored
@@ -223,7 +223,7 @@ func (c *Controller) RenderBytes() ([]byte, error) {
|
||||
}
|
||||
|
||||
buf.Reset()
|
||||
ExecuteViewPathTemplate(&buf, c.Layout, c.viewPath(), c.Data)
|
||||
ExecuteViewPathTemplate(&buf, c.Layout, c.viewPath() ,c.Data)
|
||||
}
|
||||
return buf.Bytes(), err
|
||||
}
|
||||
@@ -249,7 +249,7 @@ func (c *Controller) renderTemplate() (bytes.Buffer, error) {
|
||||
}
|
||||
}
|
||||
}
|
||||
BuildTemplate(c.viewPath(), buildFiles...)
|
||||
BuildTemplate(c.viewPath() , buildFiles...)
|
||||
}
|
||||
return buf, ExecuteViewPathTemplate(&buf, c.TplName, c.viewPath(), c.Data)
|
||||
}
|
||||
|
||||
4
vendor/github.com/fatedier/beego/controller_test.go
generated
vendored
4
vendor/github.com/fatedier/beego/controller_test.go
generated
vendored
@@ -172,10 +172,10 @@ func TestAdditionalViewPaths(t *testing.T) {
|
||||
t.Fatal("TestAdditionalViewPaths expected error")
|
||||
}
|
||||
}()
|
||||
ctrl.RenderString()
|
||||
ctrl.RenderString();
|
||||
}()
|
||||
|
||||
ctrl.TplName = "file2.tpl"
|
||||
ctrl.ViewPath = dir2
|
||||
ctrl.RenderString()
|
||||
ctrl.RenderString();
|
||||
}
|
||||
|
||||
1
vendor/github.com/fatedier/beego/logs/alils/signature.go
generated
vendored
1
vendor/github.com/fatedier/beego/logs/alils/signature.go
generated
vendored
@@ -109,3 +109,4 @@ func signature(project *LogProject, method, uri string,
|
||||
digest = base64.StdEncoding.EncodeToString(mac.Sum(nil))
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
2
vendor/github.com/fatedier/beego/orm/db.go
generated
vendored
2
vendor/github.com/fatedier/beego/orm/db.go
generated
vendored
@@ -48,7 +48,7 @@ var (
|
||||
"lte": true,
|
||||
"eq": true,
|
||||
"nq": true,
|
||||
"ne": true,
|
||||
"ne": true,
|
||||
"startswith": true,
|
||||
"endswith": true,
|
||||
"istartswith": true,
|
||||
|
||||
16
vendor/github.com/fatedier/beego/template.go
generated
vendored
16
vendor/github.com/fatedier/beego/template.go
generated
vendored
@@ -31,11 +31,11 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
beegoTplFuncMap = make(template.FuncMap)
|
||||
beegoTplFuncMap = make(template.FuncMap)
|
||||
beeViewPathTemplateLocked = false
|
||||
// beeViewPathTemplates caching map and supported template file extensions per view
|
||||
beeViewPathTemplates = make(map[string]map[string]*template.Template)
|
||||
templatesLock sync.RWMutex
|
||||
beeViewPathTemplates = make(map[string]map[string]*template.Template)
|
||||
templatesLock sync.RWMutex
|
||||
// beeTemplateExt stores the template extension which will build
|
||||
beeTemplateExt = []string{"tpl", "html"}
|
||||
// beeTemplatePreprocessors stores associations of extension -> preprocessor handler
|
||||
@@ -46,7 +46,7 @@ var (
|
||||
// writing the output to wr.
|
||||
// A template will be executed safely in parallel.
|
||||
func ExecuteTemplate(wr io.Writer, name string, data interface{}) error {
|
||||
return ExecuteViewPathTemplate(wr, name, BConfig.WebConfig.ViewsPath, data)
|
||||
return ExecuteViewPathTemplate(wr,name, BConfig.WebConfig.ViewsPath, data)
|
||||
}
|
||||
|
||||
// ExecuteViewPathTemplate applies the template with name and from specific viewPath to the specified data object,
|
||||
@@ -57,7 +57,7 @@ func ExecuteViewPathTemplate(wr io.Writer, name string, viewPath string, data in
|
||||
templatesLock.RLock()
|
||||
defer templatesLock.RUnlock()
|
||||
}
|
||||
if beeTemplates, ok := beeViewPathTemplates[viewPath]; ok {
|
||||
if beeTemplates,ok := beeViewPathTemplates[viewPath]; ok {
|
||||
if t, ok := beeTemplates[name]; ok {
|
||||
var err error
|
||||
if t.Lookup(name) != nil {
|
||||
@@ -160,9 +160,9 @@ func AddTemplateExt(ext string) {
|
||||
beeTemplateExt = append(beeTemplateExt, ext)
|
||||
}
|
||||
|
||||
// AddViewPath adds a new path to the supported view paths.
|
||||
// AddViewPath adds a new path to the supported view paths.
|
||||
//Can later be used by setting a controller ViewPath to this folder
|
||||
//will panic if called after beego.Run()
|
||||
//will panic if called after beego.Run()
|
||||
func AddViewPath(viewPath string) error {
|
||||
if beeViewPathTemplateLocked {
|
||||
panic("Can not add new view paths after beego.Run()")
|
||||
@@ -184,7 +184,7 @@ func BuildTemplate(dir string, files ...string) error {
|
||||
}
|
||||
return errors.New("dir open err")
|
||||
}
|
||||
beeTemplates, ok := beeViewPathTemplates[dir]
|
||||
beeTemplates,ok := beeViewPathTemplates[dir];
|
||||
if !ok {
|
||||
panic("Unknown view path: " + dir)
|
||||
}
|
||||
|
||||
2
vendor/github.com/fatedier/beego/toolbox/statistics.go
generated
vendored
2
vendor/github.com/fatedier/beego/toolbox/statistics.go
generated
vendored
@@ -119,7 +119,7 @@ func (m *URLMap) GetMap() map[string]interface{} {
|
||||
func (m *URLMap) GetMapData() []map[string]interface{} {
|
||||
m.lock.Lock()
|
||||
defer m.lock.Unlock()
|
||||
|
||||
|
||||
var resultLists []map[string]interface{}
|
||||
|
||||
for k, v := range m.urlmap {
|
||||
|
||||
Reference in New Issue
Block a user