Merge pull request '适配云脑接口修改' (#158) from fix-getimageinfo into develop

Reviewed-by: 史梦园 <1729788216@qq.com>

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
 }
 

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 {