From 49d759fedba1601d7afd54558b455ba6f7c9f276 Mon Sep 17 00:00:00 2001
From: yuyuanshifu <747342561@qq.com>
Date: Wed, 3 Feb 2021 17:48:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BA=91=E8=84=91=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/cloudbrain.go       |  8 +++++++-
 routers/repo/cloudbrain.go | 11 ++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/models/cloudbrain.go b/models/cloudbrain.go
index 182a13a61..592107a46 100755
--- a/models/cloudbrain.go
+++ b/models/cloudbrain.go
@@ -101,7 +101,12 @@ type GetJobResult struct {
 type GetImagesResult struct {
 	Code    string                `json:"code"`
 	Msg     string                `json:"msg"`
-	Payload map[string]*ImageInfo `json:"payload"`
+	Payload GetImagesPayload	  `json:"payload"`
+}
+
+type GetImagesPayload struct {
+	Count	int					  `json:"count"`
+	ImageInfo	[]*ImageInfo	`json:"rows"`
 }
 
 type CloudbrainsOptions struct {
@@ -236,6 +241,7 @@ type ImageInfo struct {
 	Provider    string `json:"provider"`
 	Createtime  string `json:"createtime"`
 	Remark      string `json:"remark"`
+	IsPublic    int    `json:"isPublic"`
 	PlaceView   string
 }
 
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 5b19166be..72e36d841 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -88,17 +88,18 @@ func CloudBrainNew(ctx *context.Context) {
 	result, err := cloudbrain.GetImages()
 	if err != nil {
 		ctx.Data["error"] = err.Error()
+		log.Error("cloudbrain.GetImages failed:", err.Error())
 	}
 
-	for i, payload := range result.Payload {
-		if strings.HasPrefix(result.Payload[i].Place, "192.168") {
-			result.Payload[i].PlaceView = payload.Place[strings.Index(payload.Place, "/"):len(payload.Place)]
+	for i, payload := range result.Payload.ImageInfo {
+		if strings.HasPrefix(result.Payload.ImageInfo[i].Place, "192.168") {
+			result.Payload.ImageInfo[i].PlaceView = payload.Place[strings.Index(payload.Place, "/"):len(payload.Place)]
 		} else {
-			result.Payload[i].PlaceView = payload.Place
+			result.Payload.ImageInfo[i].PlaceView = payload.Place
 		}
 	}
 
-	ctx.Data["images"] = result.Payload
+	ctx.Data["images"] = result.Payload.ImageInfo
 
 	attachs, err := models.GetAllUserAttachments(ctx.User.ID)
 	if err != nil {