test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-01 03:07:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[FIX] can not find tenant info

Browse Source
This commit is contained in:
GLYASAI 2019-09-03 17:36:14 +08:00
parent 8abd08ef89
commit 9a0e97283d
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
api/region/tenant.go
View File

@ -21,9 +21,11 @@ package region
import (
"path"
"github.com/Sirupsen/logrus"
"github.com/goodrain/rainbond/api/util"
dbmodel "github.com/goodrain/rainbond/db/model"
utilhttp "github.com/goodrain/rainbond/util/http"
"github.com/mitchellh/mapstructure"
)
type tenant struct {
@ -57,12 +59,27 @@ func (t *tenant) List() ([]*dbmodel.Tenants, *util.APIHandleError) {
return nil, util.CreateAPIHandleErrorf(400, "tenant name must be empty in this api")
}
var decode utilhttp.ResponseBody
var tenants []*dbmodel.Tenants
decode.List = &tenants
code, err := t.DoRequest(t.prefix, "GET", nil, &decode)
if err != nil {
return nil, util.CreateAPIHandleError(code, err)
}
if decode.Bean == nil {
return nil, nil
}
bean, ok := decode.Bean.(map[string]interface{})
if !ok {
logrus.Warningf("list tenants; wrong data: %v", decode.Bean)
return nil, nil
}
list, ok := bean["list"]
if !ok {
return nil, nil
}
var tenants []*dbmodel.Tenants
if err := mapstructure.Decode(list, &tenants); err != nil {
logrus.Errorf("map: %+v; error decoding to map to []*dbmodel.Tenants: %v", list, err)
return nil, util.CreateAPIHandleError(500, err)
}
return tenants, nil
}
func (t *tenant) Delete() *util.APIHandleError {