diff --git a/pkg/service/perm_application.go b/pkg/service/perm_application.go index 90e1face..9cf67c28 100644 --- a/pkg/service/perm_application.go +++ b/pkg/service/perm_application.go @@ -55,11 +55,11 @@ func GetUserApplicationSystemUsers(userId, appId string) (res []model.SystemUser return } -func ValidateUserApplicationPermission(userId, appId, systemUserId string) bool{ +func ValidateUserApplicationPermission(userId, appId, systemUserId string) bool { payload := map[string]string{ - "user_id": userId, + "user_id": userId, "application_id": appId, - "system_user_id": systemUserId, + "system_user_id": systemUserId, } Url := ValidateApplicationPermissionURL var res struct { @@ -75,11 +75,11 @@ func ValidateUserApplicationPermission(userId, appId, systemUserId string) bool{ return res.Msg } -func GetApplicationSystemUserAuthInfo(systemUserId string) (info model.SystemUserAuthInfo){ +func GetApplicationSystemUserAuthInfo(systemUserId string) (info model.SystemUserAuthInfo) { Url := fmt.Sprintf(SystemUserAuthURL, systemUserId) _, err := authClient.Get(Url, &info) if err != nil { logger.Errorf("Get system user %s auth info failed", systemUserId) } return -} \ No newline at end of file +} diff --git a/pkg/service/perm_asset.go b/pkg/service/perm_asset.go index 91921bec..9365ffee 100644 --- a/pkg/service/perm_asset.go +++ b/pkg/service/perm_asset.go @@ -2,8 +2,8 @@ package service import ( "fmt" - "net/url" "strconv" + "strings" "github.com/jumpserver/koko/pkg/logger" "github.com/jumpserver/koko/pkg/model" @@ -32,7 +32,7 @@ func getPaginationResult(reqUrl string, param model.PaginationParam) (resp model paramsArray := make([]map[string]string, 0, len(param.Searches)+2) for i := 0; i < len(param.Searches); i++ { paramsArray = append(paramsArray, map[string]string{ - "search": url.QueryEscape(param.Searches[i]), + "search": strings.TrimSpace(param.Searches[i]), }) }