1
0
mirror of https://github.com/astaxie/beego.git synced 2024-11-23 17:40:56 +00:00

Merge pull request #4348 from flycash/develop-bk

update doc
This commit is contained in:
Ming Deng 2020-12-12 23:47:48 +08:00 committed by GitHub
commit 40f7a56bf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 20 deletions

View File

@ -4,29 +4,18 @@
beego is used for rapid development of RESTful APIs, web apps and backend services in Go. beego is used for rapid development of RESTful APIs, web apps and backend services in Go.
It is inspired by Tornado, Sinatra and Flask. beego has some Go-specific features such as interfaces and struct embedding. It is inspired by Tornado, Sinatra and Flask. beego has some Go-specific features such as interfaces and struct embedding.
###### More info at [beego.me](http://beego.me). [Officail website](http://beego.me)
[Example](https://github.com/beego-dev/beego-example)
> If you could not open this website, go to [beedoc](https://github.com/beego/beedoc) > If you could not open official website, go to [beedoc](https://github.com/beego/beedoc)
## beego 1.x and 2.x ## 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` 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` 2. If you want to try beego 2.0.0, run `go get github.com/astaxie/beego@v2.0.0`
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.
###### [beego-example](https://github.com/beego-dev/beego-example)
### Web Application ### Web Application
#### Create `hello` directory, cd `hello` directory #### Create `hello` directory, cd `hello` directory
@ -40,9 +29,7 @@ v1.12.4 will be released on Jan 2021 And v2.0.0 will be released next month.
#### Download and install #### Download and install
go get -u github.com/astaxie/beego@develop go get github.com/astaxie/beego@v2.0.0
Now we are working on beego v2.0.0, so using `@develop`.
#### Create file `hello.go` #### Create file `hello.go`
```go ```go

View File

@ -28,5 +28,5 @@ var (
const ( const (
// VERSION represent beego web framework version. // VERSION represent beego web framework version.
VERSION = "2.0.0-alpha" VERSION = "2.0.0"
) )

View File

@ -149,7 +149,8 @@ func (ctx *Context) XSRFToken(key string, expire int64) string {
token, ok := ctx.GetSecureCookie(key, "_xsrf") token, ok := ctx.GetSecureCookie(key, "_xsrf")
if !ok { if !ok {
token = string(utils.RandomCreateBytes(32)) token = string(utils.RandomCreateBytes(32))
ctx.SetSecureCookie(key, "_xsrf", token, expire, "", "", true, true) // TODO make it configurable
ctx.SetSecureCookie(key, "_xsrf", token, expire, "", "")
} }
ctx._xsrfToken = token ctx._xsrfToken = token
} }