diff --git a/api/desc/core/pcm-core.api b/api/desc/core/pcm-core.api index 67b55917..198fd7bd 100644 --- a/api/desc/core/pcm-core.api +++ b/api/desc/core/pcm-core.api @@ -595,8 +595,8 @@ type ( //apps 详情参数 type ( AppDetailReq { - Name string `path:"name"` - NsID string `param:"nsID"` + Name string `path:"appName"` + NsID string `form:"nsID"` } AppDetailResp { CpuCores float64 `json:"cpuCores"` diff --git a/api/desc/pcm.api b/api/desc/pcm.api index fcea9471..844f23ce 100644 --- a/api/desc/pcm.api +++ b/api/desc/pcm.api @@ -533,5 +533,5 @@ service pcm { @doc "应用详情" @handler AppDetailHandler - get /apps/detail (AppDetailReq) returns (AppDetailResp) + get /apps/detail/:appName (AppDetailReq) returns (AppDetailResp) } \ No newline at end of file diff --git a/api/etc/pcm.yaml b/api/etc/pcm.yaml index 149fb1d2..84d70409 100644 --- a/api/etc/pcm.yaml +++ b/api/etc/pcm.yaml @@ -4,7 +4,7 @@ NacosConfig: ServerConfigs: # - IpAddr: 127.0.0.1 # Port: 8848 - - IpAddr: 127.0.0.1 + - IpAddr: nacos.jcce.dev Port: 8848 ClientConfig: NamespaceId: test diff --git a/api/internal/handler/routes.go b/api/internal/handler/routes.go index 2164883f..b042695b 100644 --- a/api/internal/handler/routes.go +++ b/api/internal/handler/routes.go @@ -641,7 +641,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { }, { Method: http.MethodGet, - Path: "/apps/detail", + Path: "/apps/detail/:appName", Handler: apps.AppDetailHandler(serverCtx), }, }, diff --git a/api/internal/logic/apps/appdetaillogic.go b/api/internal/logic/apps/appdetaillogic.go index f10c2569..55d074c6 100644 --- a/api/internal/logic/apps/appdetaillogic.go +++ b/api/internal/logic/apps/appdetaillogic.go @@ -2,6 +2,8 @@ package apps import ( "context" + "fmt" + "gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes/kubernetes" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" @@ -25,6 +27,13 @@ func NewAppDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AppDeta func (l *AppDetailLogic) AppDetail(req *types.AppDetailReq) (resp *types.AppDetailResp, err error) { // todo: add your logic here and delete this line + fmt.Println(req.Name) + //调用p端接口 + appDetail, err := l.svcCtx.K8sRpc[1727670068428410880].GetAppDetail(context.Background(), &kubernetes.AppDetailReq{ + Namespace: req.NsID, + Name: req.Name, + }) + fmt.Println("应用详情:", appDetail) return } diff --git a/api/internal/types/types.go b/api/internal/types/types.go index 51aa0cc5..1207a0e0 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -556,8 +556,8 @@ type App struct { } type AppDetailReq struct { - Name string `path:"name"` - NsID string `param:"nsID"` + Name string `path:"appName"` + NsID string `form:"nsID"` } type AppDetailResp struct { diff --git a/go.mod b/go.mod index ca735b99..e18489c4 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/zeromicro/go-zero v1.6.0 gitlink.org.cn/jcce-pcm/pcm-ac v0.0.0-20231108025612-8f0044dd7a95 gitlink.org.cn/jcce-pcm/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d - gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20231124020230-30f5f95a759b + gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20231124061825-c57371a25711 gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20231101085149-724c7c4cc090 gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20231101091522-38307e241dfd gitlink.org.cn/jcce-pcm/pcm-participant-openstack v0.0.0-20231102023739-81a3d353c10d diff --git a/go.sum b/go.sum index bbde88a8..ff710d53 100644 --- a/go.sum +++ b/go.sum @@ -1000,8 +1000,8 @@ gitlink.org.cn/jcce-pcm/pcm-ac v0.0.0-20231108025612-8f0044dd7a95 h1:63M79RcLdA1 gitlink.org.cn/jcce-pcm/pcm-ac v0.0.0-20231108025612-8f0044dd7a95/go.mod h1:ySZHK8NpHn4gjbLoOtJbSEUDiYZVwjbnFAcG71gXPgg= gitlink.org.cn/jcce-pcm/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d h1:DHjl/rLuH2gKYtY0MKMGNQDHFT12APg25RlMUQo+tHk= gitlink.org.cn/jcce-pcm/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d/go.mod h1:r/KLzUpupCV5jdxSfgDhc2pVjP0fBi3VhAWRttsBn30= -gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20231124020230-30f5f95a759b h1:+Bb1JRgetdniM/HEqSm45ZU2YZPJx5ZHHeaC+BlaDyo= -gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20231124020230-30f5f95a759b/go.mod h1:nto0MrfeackGWkbwgkRW45+RIRvwHHqvNqs9Yz+O9j0= +gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20231124061825-c57371a25711 h1:+7shcqdsKeuOpU3kanfGJGx6k535cF9WWTX9nmNgk/s= +gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20231124061825-c57371a25711/go.mod h1:nto0MrfeackGWkbwgkRW45+RIRvwHHqvNqs9Yz+O9j0= gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20231101085149-724c7c4cc090 h1:jztlHo72bcWM1jUwvG3Hfk2K+AJL0RvlsdIqlktH/MI= gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20231101085149-724c7c4cc090/go.mod h1:pisJKAI8FRFFUcBaH3Gob+ENXWRM97rpuYmv9s1raag= gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20231101091522-38307e241dfd h1:9GIKpN6nel4U5jD91HL/vjzwo+EHTpE13SkT7WKyXtQ=