From 502822df5278926462340b04a8f61eda049ecd55 Mon Sep 17 00:00:00 2001 From: YuTang Song <2313186065@qq.com> Date: Thu, 25 Jun 2026 09:32:08 +0800 Subject: [PATCH 1/5] fix: show all of dms data Signed-off-by: YuTang Song <2313186065@qq.com> --- pkg/microservice/aslan/core/system/service/dms.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/microservice/aslan/core/system/service/dms.go b/pkg/microservice/aslan/core/system/service/dms.go index c1716fb6c0..15aba582dc 100644 --- a/pkg/microservice/aslan/core/system/service/dms.go +++ b/pkg/microservice/aslan/core/system/service/dms.go @@ -53,6 +53,8 @@ func ListDMSOrders(ctx *internalhandler.Context, id string, keyword string) ([]* OrderResultType: tea.String("AS_ADMIN"), SearchContent: tea.String(keyword), OrderStatus: tea.String("RUNNING"), + PageNumber: tea.Int32(1), + PageSize: tea.Int32(200), } orderList, err := client.ListOrders(listOrdersRequest) From 8f4ae9031ddfd29a0b71c23366142eb18ae0358e Mon Sep 17 00:00:00 2001 From: YuTang Song <2313186065@qq.com> Date: Thu, 25 Jun 2026 10:50:12 +0800 Subject: [PATCH 2/5] fix: proto render Signed-off-by: YuTang Song <2313186065@qq.com> --- .../service/workflowcontroller/jobcontroller/job_apisix.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_apisix.go b/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_apisix.go index 0c0e2bc0a9..ecd3c31b09 100644 --- a/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_apisix.go +++ b/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_apisix.go @@ -289,6 +289,7 @@ func (c *ApisixJobCtl) executeServiceTask(client *apisix.Client, task *commonmod func (c *ApisixJobCtl) executeProtoTask(client *apisix.Client, task *commonmodels.ApisixItemUpdateSpec) error { proto, err := convertToProto(task.UserSpec) + if err != nil { return fmt.Errorf("failed to convert spec to proto: %v", err) } @@ -399,6 +400,9 @@ func convertToProto(spec interface{}) (*apisix.Proto, error) { return nil, fmt.Errorf("failed to unmarshal to proto: %v", err) } + proto.ID = proto.Name + proto.Desc = proto.Name + return proto, nil } From 666ed836450e190c3d7a64b0c5578faba322c186 Mon Sep 17 00:00:00 2001 From: YuTang Song <2313186065@qq.com> Date: Thu, 25 Jun 2026 10:50:59 +0800 Subject: [PATCH 3/5] debug: add log for proto Signed-off-by: YuTang Song <2313186065@qq.com> --- .../service/workflowcontroller/jobcontroller/job_apisix.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_apisix.go b/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_apisix.go index ecd3c31b09..36210611a0 100644 --- a/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_apisix.go +++ b/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_apisix.go @@ -23,6 +23,7 @@ import ( "go.uber.org/zap" + "github.com/koderover/zadig/v2/pkg/cli/zadig-agent/helper/log" "github.com/koderover/zadig/v2/pkg/microservice/aslan/config" commonmodels "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/models" commonrepo "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/mongodb" @@ -402,6 +403,7 @@ func convertToProto(spec interface{}) (*apisix.Proto, error) { proto.ID = proto.Name proto.Desc = proto.Name + log.Info("proto", zap.Any("proto", proto)) return proto, nil } From 3fc6072d3bbd0c1002671b69b1660fb46e267654 Mon Sep 17 00:00:00 2001 From: YuTang Song <2313186065@qq.com> Date: Thu, 25 Jun 2026 11:11:35 +0800 Subject: [PATCH 4/5] fix: proto id render Signed-off-by: YuTang Song <2313186065@qq.com> --- .../workflowcontroller/jobcontroller/job_apisix.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_apisix.go b/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_apisix.go index 36210611a0..8cb18d663d 100644 --- a/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_apisix.go +++ b/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_apisix.go @@ -23,7 +23,6 @@ import ( "go.uber.org/zap" - "github.com/koderover/zadig/v2/pkg/cli/zadig-agent/helper/log" "github.com/koderover/zadig/v2/pkg/microservice/aslan/config" commonmodels "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/models" commonrepo "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/mongodb" @@ -297,7 +296,9 @@ func (c *ApisixJobCtl) executeProtoTask(client *apisix.Client, task *commonmodel switch task.Action { case config.ApisixActionTypeCreate: - resp, err := client.CreateProto(proto) + // resp, err := client.CreateProto(proto) + id := proto.Name + resp, err := client.UpdateProto(id, proto) if err != nil { return err } @@ -400,10 +401,7 @@ func convertToProto(spec interface{}) (*apisix.Proto, error) { if err := json.Unmarshal(data, proto); err != nil { return nil, fmt.Errorf("failed to unmarshal to proto: %v", err) } - - proto.ID = proto.Name proto.Desc = proto.Name - log.Info("proto", zap.Any("proto", proto)) return proto, nil } From b40ab95ee38198f10594eab9c69d40998aea4315 Mon Sep 17 00:00:00 2001 From: YuTang Song <2313186065@qq.com> Date: Thu, 25 Jun 2026 14:35:08 +0800 Subject: [PATCH 5/5] fix: proto render id Signed-off-by: YuTang Song <2313186065@qq.com> --- .../service/workflowcontroller/jobcontroller/job_apisix.go | 5 ++--- pkg/microservice/aslan/core/system/service/dms.go | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_apisix.go b/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_apisix.go index 8cb18d663d..0ccf544bdd 100644 --- a/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_apisix.go +++ b/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_apisix.go @@ -296,9 +296,7 @@ func (c *ApisixJobCtl) executeProtoTask(client *apisix.Client, task *commonmodel switch task.Action { case config.ApisixActionTypeCreate: - // resp, err := client.CreateProto(proto) - id := proto.Name - resp, err := client.UpdateProto(id, proto) + resp, err := client.UpdateProto(proto.ID, proto) if err != nil { return err } @@ -402,6 +400,7 @@ func convertToProto(spec interface{}) (*apisix.Proto, error) { return nil, fmt.Errorf("failed to unmarshal to proto: %v", err) } proto.Desc = proto.Name + proto.ID = proto.Name return proto, nil } diff --git a/pkg/microservice/aslan/core/system/service/dms.go b/pkg/microservice/aslan/core/system/service/dms.go index 15aba582dc..c1716fb6c0 100644 --- a/pkg/microservice/aslan/core/system/service/dms.go +++ b/pkg/microservice/aslan/core/system/service/dms.go @@ -53,8 +53,6 @@ func ListDMSOrders(ctx *internalhandler.Context, id string, keyword string) ([]* OrderResultType: tea.String("AS_ADMIN"), SearchContent: tea.String(keyword), OrderStatus: tea.String("RUNNING"), - PageNumber: tea.Int32(1), - PageSize: tea.Int32(200), } orderList, err := client.ListOrders(listOrdersRequest)