test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-11-30 02:38:17 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[REV] optimize get tenant manage api

Browse Source
This commit is contained in:
bay1ts 2017-12-07 14:01:46 +08:00
parent 5617e1baf9
commit 84b34ea2e9
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/api/controller/resources.go
View File

@ -164,16 +164,8 @@ func (t *TenantStruct) TenantsQuery(w http.ResponseWriter, r *http.Request) {
// description: 统一返回格式
rules := validator.MapData{
"tenant_name": []string{"required"},
}
tenantName := strings.TrimSpace(chi.URLParam(r, "tenant_name"))
data, ok := httputil.ValidatorRequestMapAndErrorResponse(r, w, rules, nil)
if !ok {
return
}
tenantName := data["tenant_name"].(string)
rep, err := handler.GetTenantManager().GetTenantsName()
if err != nil {
@ -217,7 +209,7 @@ func (t *TenantStruct) TenantsGetByName(w http.ResponseWriter, r *http.Request)
tenantName := chi.URLParam(r, "tenant_name")
tenantName := strings.TrimSpace(chi.URLParam(r, "tenant_name"))
v, err := handler.GetTenantManager().GetTenantsByName(tenantName)
if err != nil {
@ -280,18 +272,11 @@ func (t *TenantStruct) TenantsWithResource(w http.ResponseWriter, r *http.Reques
// description: 统一返回格式
rules := validator.MapData{
"curPage": []string{"required"},
"pageLen": []string{"required"},
}
data, ok := httputil.ValidatorRequestMapAndErrorResponse(r, w, rules, nil)
if !ok {
return
}
pageLenStr := strings.TrimSpace(chi.URLParam(r, "pageLen"))
curPageStr := strings.TrimSpace(chi.URLParam(r, "curPage"))
pageLenStr := data["pageLen"].(string)
curPageStr := data["curPage"].(string)
pageLen,err:=strconv.Atoi(pageLenStr)
if err != nil {