lbsadmin
/
Beego
mirror of https://github.com/astaxie/beego.git
1
0
Fork 0
Code Issues Releases Activity

ServeJson ServeJsonp ServeXml and choice

This commit is contained in:
astaxie 2013-08-16 15:49:16 +08:00
parent a3363b0605
commit 0372b817d1
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
controller.go
View File

@ -216,7 +216,13 @@ func (c *Controller) Abort(code string) {
}
func (c *Controller) ServeJson(encoding ...bool) {
content, err := json.Marshal(c.Data["json"])
var content []byte
var err error
if RunMode == "prod" {
content, err = json.Marshal(c.Data["json"])
} else {
content, err = json.MarshalIndent(c.Data["json"], "", " ")
}
if err != nil {
http.Error(c.Ctx.ResponseWriter, err.Error(), http.StatusInternalServerError)
return
@ -229,7 +235,13 @@ func (c *Controller) ServeJson(encoding ...bool) {
}
func (c *Controller) ServeJsonp() {
content, err := json.Marshal(c.Data["jsonp"])
var content []byte
var err error
if RunMode == "prod" {
content, err = json.Marshal(c.Data["jsonp"])
} else {
content, err = json.MarshalIndent(c.Data["jsonp"], "", " ")
}
if err != nil {
http.Error(c.Ctx.ResponseWriter, err.Error(), http.StatusInternalServerError)
return
@ -248,7 +260,13 @@ func (c *Controller) ServeJsonp() {
}
func (c *Controller) ServeXml() {
content, err := xml.Marshal(c.Data["xml"])
var content []byte
var err error
if RunMode == "prod" {
content, err = xml.Marshal(c.Data["xml"])
} else {
content, err = xml.MarshalIndent(c.Data["xml"], "", " ")
}
if err != nil {
http.Error(c.Ctx.ResponseWriter, err.Error(), http.StatusInternalServerError)
return