From bbf5d8f42b15566bdffa5b53ed842082d56c925a Mon Sep 17 00:00:00 2001
From: luojielin <384184718@qq.com>
Date: Wed, 14 Jul 2021 17:20:28 +0800
Subject: [PATCH] fix ListMembers response

---
 .../organization_management_client.go         |  5 +++--
 .../organization_management_client_test.go    |  8 +++----
 lib/model/vo_model.go                         | 22 ++++++++++++++++---
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/lib/management/organization_management_client.go b/lib/management/organization_management_client.go
index 08e640b..8268322 100644
--- a/lib/management/organization_management_client.go
+++ b/lib/management/organization_management_client.go
@@ -9,13 +9,14 @@ import (
 	"log"
 )
 
-func (c *Client) ExportAll() ([]model.Node, error) {
-	var q []model.Node
+func (c *Client) ExportAll() ([]model.OrgNode, error) {
+	var q []model.OrgNode
 	b, err := c.SendHttpRequest(c.Host+"/api/v2/orgs/export", constant.HttpMethodGet, "", nil)
 	if err != nil {
 		return q, err
 	}
 	var response model.ExportAllOrganizationResponse
+	log.Println(string(b))
 	jsoniter.Unmarshal(b, &response)
 	return response.Data, nil
 }
diff --git a/lib/management/organization_management_client_test.go b/lib/management/organization_management_client_test.go
index ac0c5b9..cc0c378 100644
--- a/lib/management/organization_management_client_test.go
+++ b/lib/management/organization_management_client_test.go
@@ -8,8 +8,8 @@ import (
 )
 
 const (
-	userPoolId = "60a6f97f3f50c7a9483e313d"
-	appSecret  = "d254623f808ba850d5d5ea7b07bead60"
+	userPoolId = "60e043f8cd91b87d712b6365"
+	appSecret  = "158c7679333bc196b524d78d745813e5"
 )
 
 func TestClient_ExportAll(t *testing.T) {
@@ -17,7 +17,7 @@ func TestClient_ExportAll(t *testing.T) {
 	log.Println("==========导出所有组织机构数据==========")
 	resp, _ := client.ExportAll()
 	log.Printf("%+v\n", resp)
-	log.Println("==========获取节点成员==========")
+	/*log.Println("==========获取节点成员==========")
 	var req = &model.ListMemberRequest{
 		NodeId:               "60cd9d3a4b96cfff16e7e5f4",
 		Page:                 1,
@@ -28,7 +28,7 @@ func TestClient_ExportAll(t *testing.T) {
 	log.Printf("%+v\n", resp1)
 	log.Println("==========通过 ID 获取用户信息==========")
 	resp2, _ := client.Detail("60a6f9ad5bcccc51834950c5")
-	log.Printf("%+v\n", resp2)
+	log.Printf("%+v\n", resp2)*/
 }
 func TestClient_GetOrganizationList(t *testing.T) {
 	client := NewClient(userPoolId, appSecret)
diff --git a/lib/model/vo_model.go b/lib/model/vo_model.go
index 788f67f..2817cdb 100644
--- a/lib/model/vo_model.go
+++ b/lib/model/vo_model.go
@@ -23,9 +23,9 @@ type UserDetailResponse struct {
 }
 
 type ExportAllOrganizationResponse struct {
-	Message string `json:"message"`
-	Code    int64  `json:"code"`
-	Data    []Node `json:"data"`
+	Message string    `json:"message"`
+	Code    int64     `json:"code"`
+	Data    []OrgNode `json:"data"`
 }
 
 type NodeByIdDetail struct {
@@ -128,3 +128,19 @@ type OidcParams struct {
 	CodeChallengeMethod string
 	CodeChallenge       string
 }
+
+type OrgNode struct {
+	Id              string    `json:"id"`
+	OrgId           *string   `json:"orgId"`
+	CreatedAt       *string   `json:"createdAt"`
+	UpdatedAt       *string   `json:"updatedAt"`
+	UserPoolId      *string   `json:"userPoolId"`
+	Name            string    `json:"name"`
+	NameI18n        *string   `json:"nameI18n"`
+	Description     *string   `json:"description"`
+	DescriptionI18n *string   `json:"descriptionI18n"`
+	Order           *int64    `json:"order"`
+	Code            *string   `json:"code"`
+	Members         []User    `json:"members"`
+	Children        []OrgNode `json:"children"`
+}