From d51c5aed5584eb509f6fcd4e6c60a684fc6a232c Mon Sep 17 00:00:00 2001
From: zhangwei <894646498@qq.com>
Date: Mon, 10 Jul 2023 17:05:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=9C=E5=83=8F=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B3=A8=E9=87=8A=20=E5=BC=80=E5=8F=91=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 0df5d171dc5ae18ee9245d8d519bc9986694ff15
---
 .../internal/logic/image/imagelistlogic.go    | 53 +++++++++----------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/adaptor/PCM-CORE/api/internal/logic/image/imagelistlogic.go b/adaptor/PCM-CORE/api/internal/logic/image/imagelistlogic.go
index f2e2b363..3081d2ba 100644
--- a/adaptor/PCM-CORE/api/internal/logic/image/imagelistlogic.go
+++ b/adaptor/PCM-CORE/api/internal/logic/image/imagelistlogic.go
@@ -3,10 +3,7 @@ package image
 import (
 	"PCM/adaptor/PCM-CORE/api/internal/svc"
 	"PCM/adaptor/PCM-CORE/api/internal/types"
-	"PCM/common/tool"
 	"context"
-	"encoding/json"
-	"fmt"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
@@ -32,29 +29,29 @@ func NewImageListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ImageLi
 func (l *ImageListLogic) ImageList() (resp *types.ImageListResp, err error) {
 
 	// 获取镜像列表
-	url := fmt.Sprintf("%s/repository/%s/v2/_catalog", l.svcCtx.Config.NexusUrl, "pcm")
-	bytes, err := tool.HttpClient("GET", url, nil, "")
-	json.Unmarshal(bytes, &resp)
-	result := types.ImageListResp{}
-	for _, image := range resp.Repositories {
-		// 获取镜像的tag列表
-		url := fmt.Sprintf("%s/repository/%s/v2/%s/tags/list", l.svcCtx.Config.NexusUrl, "pcm", image)
-		bytes, err := tool.HttpClient("GET", url, nil, "")
-		if err != nil {
-			return nil, err
-		}
-		tags := ImageTags{}
-		json.Unmarshal(bytes, &tags)
-		// 拼接镜像名称
-		for _, tag := range tags.Tags {
-			var name string
-			if tag != "latest" {
-				name = "hub.jcce.dev:18445/" + image + ":" + tag
-			} else {
-				name = "hub.jcce.dev:18445/" + image
-			}
-			result.Repositories = append(result.Repositories, name)
-		}
-	}
-	return &result, nil
+	//url := fmt.Sprintf("%s/repository/%s/v2/_catalog", l.svcCtx.Config.NexusUrl, "pcm")
+	//bytes, err := tool.HttpClient("GET", url, nil, "")
+	//json.Unmarshal(bytes, &resp)
+	//result := types.ImageListResp{}
+	//for _, image := range resp.Repositories {
+	//	// 获取镜像的tag列表
+	//	url := fmt.Sprintf("registry.cn-hangzhou.aliyuncs.com/jointcloud/pcm:", image)
+	//	bytes, err := tool.HttpClient("GET", url, nil, "")
+	//	if err != nil {
+	//		return nil, err
+	//	}
+	//	tags := ImageTags{}
+	//	json.Unmarshal(bytes, &tags)
+	//	// 拼接镜像名称
+	//	for _, tag := range tags.Tags {
+	//		var name string
+	//		if tag != "latest" {
+	//			name = "hub.jcce.dev:18445/" + image + ":" + tag
+	//		} else {
+	//			name = "hub.jcce.dev:18445/" + image
+	//		}
+	//		result.Repositories = append(result.Repositories, name)
+	//	}
+	//}
+	return nil, nil
 }