lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-23 19:20:53 +00:00
Code Issues Releases Activity

Merge pull request #4323 from flycash/fix4298

Browse Source 
Update doc & update default conf path
This commit is contained in:
Ming Deng 2020-11-25 20:48:53 +08:00 committed by GitHub
commit 359ad7a889
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
README.md
View File

@ -6,6 +6,21 @@ It is inspired by Tornado, Sinatra and Flask. beego has some Go-specific feature
###### More info at [beego.me](http://beego.me). ###### More info at [beego.me](http://beego.me).
> If you could not open this website, go to [beedoc](https://github.com/beego/beedoc)
## beego 1.x and 2.x
We recently release beego 2.0.0-beta, and its structure change a lot, so you may get some error
1. If you are working on beego v1.x please try `go get github.com/astaxie/beego@v1.12.3`
2. If you want to try beego 2.0.0, run `go get github.com/astaxie/beego@develop`
We are still working on fix bug and documentation of v2.x. And v2.x's doc will be released with v2.0.0.
## Next version
v1.12.4 will be released on Jan 2021 And v2.0.0 will be released next month.
## Quick Start ## Quick Start
###### Please see [Documentation](http://beego.me/docs) for more. ###### Please see [Documentation](http://beego.me/docs) for more.
@ -25,7 +40,7 @@ It is inspired by Tornado, Sinatra and Flask. beego has some Go-specific feature
#### Download and install #### Download and install
go get github.com/astaxie/beego go get -u github.com/astaxie/beego
#### Create file `hello.go` #### Create file `hello.go`
```go ```go

1
core/config/global.go
View File

@ -18,7 +18,6 @@ package config
// for most users, they only need to use those methods // for most users, they only need to use those methods
var globalInstance Configer var globalInstance Configer
// InitGlobalInstance will ini the global instance // InitGlobalInstance will ini the global instance
// If you want to use specific implementation, don't forget to import it. // If you want to use specific implementation, don't forget to import it.
// e.g. _ import "github.com/astaxie/beego/core/config/etcd" // e.g. _ import "github.com/astaxie/beego/core/config/etcd"

2
core/config/ini.go
View File

@ -519,7 +519,7 @@ func (c *IniConfigContainer) Unmarshaler(prefix string, obj interface{}, opt ...
func init() { func init() {
Register("ini", &IniConfig{}) Register("ini", &IniConfig{})
err := InitGlobalInstance("ini", "config/app.conf") err := InitGlobalInstance("ini", "conf/app.conf")
if err != nil { if err != nil {
logs.Warn("init global config instance failed. If you donot use this, just ignore it. ", err) logs.Warn("init global config instance failed. If you donot use this, just ignore it. ", err)
} }

1
server/web/router.go
View File

@ -273,7 +273,6 @@ func (p *ControllerRegister) Include(cList ...ControllerInterface) {
for _, f := range a.Filters { for _, f := range a.Filters {
p.InsertFilter(f.Pattern, f.Pos, f.Filter, WithReturnOnOutput(f.ReturnOnOutput), WithResetParams(f.ResetParams)) p.InsertFilter(f.Pattern, f.Pos, f.Filter, WithReturnOnOutput(f.ReturnOnOutput), WithResetParams(f.ResetParams))
} }
p.addWithMethodParams(a.Router, c, a.MethodParams, strings.Join(a.AllowHTTPMethods, ",")+":"+a.Method) p.addWithMethodParams(a.Router, c, a.MethodParams, strings.Join(a.AllowHTTPMethods, ",")+":"+a.Method)
} }
} }