From 8c3c022f0c88ee7fcc555f5028d0129d8fd8ff49 Mon Sep 17 00:00:00 2001 From: Fred Date: Tue, 27 Oct 2020 08:06:31 +0800 Subject: [PATCH] update production --- classes/APIgoatDoc.php | 6 ++---- classes/APIgoatFetchAPI.php | 9 ++++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/classes/APIgoatDoc.php b/classes/APIgoatDoc.php index c23c291..c2e4265 100644 --- a/classes/APIgoatDoc.php +++ b/classes/APIgoatDoc.php @@ -8,17 +8,15 @@ class APIgoatDoc extends APIgoatTemplate $content = ''; $menu = ''; - //preprint($data); - foreach ($data as $row) { $menu .= li(href($row['name'], '#' . $row['title']), "class='page_item current_page_item'"); $content .= div( anchor($row['title']) . h3($row['name']) . h2($row['title'], "class='entry-title'") - . p($row['type'] . " " . $row['value']) - . ((!empty($row['example'])) ? pre(htmlentities($row['example'])) : '') + . span($row['type'] . " " . $row['value']) . p(trim($row['text'])) + . ((!empty($row['example'])) ? div(span("Example:") . pre(htmlentities($row['example']))) : '') ); } diff --git a/classes/APIgoatFetchAPI.php b/classes/APIgoatFetchAPI.php index 66c5469..86accb6 100644 --- a/classes/APIgoatFetchAPI.php +++ b/classes/APIgoatFetchAPI.php @@ -23,7 +23,8 @@ class APIgoatFetchAPI $this->clientOptions = [ 'verify' => false, 'content-Type' => 'application/json', - 'accept' => 'application/json' + 'accept' => 'application/json', + 'debug' => false ]; if (!$this->authenticationValid()) { @@ -40,7 +41,7 @@ class APIgoatFetchAPI { $clientOptions = $this->clientOptions; $clientOptions['query'] = [ - "Query" => [ + "query" => [ "select" => [ ["behavior.name", "name"], ["code", "title"], ["description", "text"], "value", "example", "type", ["behavior_category.name", "category_name"] ], @@ -51,7 +52,8 @@ class APIgoatFetchAPI ] ], "join" => ["behavior_category"], - "limit" => 20 + "limit" => 20, + "recurse" => "behavior_file" ], "debug" => true ]; @@ -59,6 +61,7 @@ class APIgoatFetchAPI $response = $this->client->get('Behavior', $clientOptions); + $body = json_decode($response->getBody()->getContents(), true); if ($response->getStatusCode() == 200) { return $body;