diff --git a/controller/service/iml.go b/controller/service/iml.go index 01d207ba..2bd044cd 100644 --- a/controller/service/iml.go +++ b/controller/service/iml.go @@ -61,7 +61,7 @@ func newAIUpstream(id string, provider string, uri model_runtime.IProviderURI) * } } -func (i *imlServiceController) EditAIService(ctx *gin.Context, id string, input *service_dto.EditService) (*service_dto.Service, error) { +func (i *imlServiceController) editAIService(ctx *gin.Context, id string, input *service_dto.EditService) (*service_dto.Service, error) { if input.Provider == nil { return nil, fmt.Errorf("provider is required") @@ -89,9 +89,7 @@ func (i *imlServiceController) EditAIService(ctx *gin.Context, id string, input return info, nil } -func (i *imlServiceController) CreateAIService(ctx *gin.Context, teamID string, input *service_dto.CreateService) (*service_dto.Service, error) { - kind := "ai" - input.Kind = &kind +func (i *imlServiceController) createAIService(ctx *gin.Context, teamID string, input *service_dto.CreateService) (*service_dto.Service, error) { if input.Provider == nil { return nil, fmt.Errorf("provider is required") } @@ -222,21 +220,8 @@ func (i *imlServiceController) CreateAIService(ctx *gin.Context, teamID string, return info, err } -func (i *imlServiceController) DeleteAIService(ctx *gin.Context, id string) error { - // TODO: 检查是否有发布过版本，若发布，则不允许删除 - return i.module.Delete(ctx, id, "ai") -} - -func (i *imlServiceController) SearchMyAIServices(ctx *gin.Context, teamID string, keyword string) ([]*service_dto.ServiceItem, error) { - return i.module.SearchMyServicesByKind(ctx, teamID, keyword, "ai") -} - -func (i *imlServiceController) SearchAIServices(ctx *gin.Context, teamID string, keyword string) ([]*service_dto.ServiceItem, error) { - return i.module.Search(ctx, teamID, keyword, "ai") -} - func (i *imlServiceController) SearchMyServices(ctx *gin.Context, teamId string, keyword string) ([]*service_dto.ServiceItem, error) { - return i.module.SearchMyServicesByKind(ctx, teamId, keyword, "") + return i.module.SearchMyServices(ctx, teamId, keyword) } //func (i *imlServiceController) Simple(ctx *gin.Context, keyword string) ([]*service_dto.SimpleServiceItem, error) { @@ -252,19 +237,29 @@ func (i *imlServiceController) Get(ctx *gin.Context, id string) (*service_dto.Se } func (i *imlServiceController) Search(ctx *gin.Context, teamID string, keyword string) ([]*service_dto.ServiceItem, error) { - return i.module.Search(ctx, teamID, keyword, "") + return i.module.Search(ctx, teamID, keyword) } func (i *imlServiceController) Create(ctx *gin.Context, teamID string, input *service_dto.CreateService) (*service_dto.Service, error) { + if input.Kind == "ai" { + return i.createAIService(ctx, teamID, input) + } return i.module.Create(ctx, teamID, input) } func (i *imlServiceController) Edit(ctx *gin.Context, id string, input *service_dto.EditService) (*service_dto.Service, error) { + info, err := i.Get(ctx, id) + if err != nil { + return nil, err + } + if info.ServiceKind == "ai" { + return i.editAIService(ctx, id, input) + } return i.module.Edit(ctx, id, input) } func (i *imlServiceController) Delete(ctx *gin.Context, id string) error { - return i.module.Delete(ctx, id, "") + return i.module.Delete(ctx, id) } func (i *imlServiceController) ServiceDoc(ctx *gin.Context, id string) (*service_dto.ServiceDoc, error) { diff --git a/controller/service/service.go b/controller/service/service.go index f1529302..3f19cd66 100644 --- a/controller/service/service.go +++ b/controller/service/service.go @@ -25,11 +25,11 @@ type IServiceController interface { ServiceDoc(ctx *gin.Context, id string) (*service_dto.ServiceDoc, error) SaveServiceDoc(ctx *gin.Context, id string, input *service_dto.SaveServiceDoc) error - CreateAIService(ctx *gin.Context, teamID string, input *service_dto.CreateService) (*service_dto.Service, error) - EditAIService(ctx *gin.Context, id string, input *service_dto.EditService) (*service_dto.Service, error) - DeleteAIService(ctx *gin.Context, id string) error - SearchMyAIServices(ctx *gin.Context, teamID string, keyword string) ([]*service_dto.ServiceItem, error) - SearchAIServices(ctx *gin.Context, teamID string, keyword string) ([]*service_dto.ServiceItem, error) + //createAIService(ctx *gin.Context, teamID string, input *service_dto.CreateService) (*service_dto.Service, error) + //editAIService(ctx *gin.Context, id string, input *service_dto.EditService) (*service_dto.Service, error) + //DeleteAIService(ctx *gin.Context, id string) error + //SearchMyAIServices(ctx *gin.Context, teamID string, keyword string) ([]*service_dto.ServiceItem, error) + //SearchAIServices(ctx *gin.Context, teamID string, keyword string) ([]*service_dto.ServiceItem, error) } type IAppController interface { diff --git a/module/service/dto/input.go b/module/service/dto/input.go index 63192be0..c3409b00 100644 --- a/module/service/dto/input.go +++ b/module/service/dto/input.go @@ -10,7 +10,7 @@ type CreateService struct { Tags []string `json:"tags"` Catalogue string `json:"catalogue"` ApprovalType string `json:"approval_type"` - Kind *string `json:"kind,omitempty"` + Kind string `json:"kind"` Provider *string `json:"provider" aocheck:"ai_provider"` AsApp *bool `json:"as_app"` AsServer *bool `json:"as_server"` diff --git a/module/service/dto/output.go b/module/service/dto/output.go index 6ceaf1ee..55a5c1a0 100644 --- a/module/service/dto/output.go +++ b/module/service/dto/output.go @@ -9,6 +9,7 @@ type ServiceItem struct { Id string `json:"id"` Name string `json:"name"` Team auto.Label `json:"team" aolabel:"team"` + ServiceKind string `json:"service_kind"` ApiNum int64 `json:"api_num"` Description string `json:"description"` CreateTime auto.TimeLabel `json:"create_time"` @@ -59,6 +60,7 @@ type Service struct { ApprovalType string `json:"approval_type"` AsServer bool `json:"as_server"` AsApp bool `json:"as_app"` + ServiceKind string `json:"service_kind"` } type App struct { @@ -87,6 +89,7 @@ func ToService(model *service.Service) *Service { ApprovalType: model.ApprovalType.String(), AsServer: model.AsServer, AsApp: model.AsApp, + ServiceKind: model.Kind.String(), } switch model.Kind { case service.AIService: diff --git a/module/service/iml.go b/module/service/iml.go index a9250b41..075521f0 100644 --- a/module/service/iml.go +++ b/module/service/iml.go @@ -112,12 +112,11 @@ func (i *imlServiceModule) ExportAll(ctx context.Context) ([]*service_dto.Export } -func (i *imlServiceModule) searchMyServices(ctx context.Context, teamId string, keyword string, kind service.Kind) ([]*service.Service, error) { +func (i *imlServiceModule) searchMyServices(ctx context.Context, teamId string, keyword string) ([]*service.Service, error) { userID := utils.UserId(ctx) condition := make(map[string]interface{}) condition["as_server"] = true - condition["kind"] = kind.Int() if teamId != "" { _, err := i.teamService.Get(ctx, teamId) if err != nil { @@ -137,8 +136,8 @@ func (i *imlServiceModule) searchMyServices(ctx context.Context, teamId string, } -func (i *imlServiceModule) SearchMyServicesByKind(ctx context.Context, teamId string, keyword string, kind string) ([]*service_dto.ServiceItem, error) { - services, err := i.searchMyServices(ctx, teamId, keyword, service.Kind(kind)) +func (i *imlServiceModule) SearchMyServices(ctx context.Context, teamId string, keyword string) ([]*service_dto.ServiceItem, error) { + services, err := i.searchMyServices(ctx, teamId, keyword) if err != nil { return nil, err } @@ -156,7 +155,7 @@ func (i *imlServiceModule) SearchMyServicesByKind(ctx context.Context, teamId st continue } apiCount := apiCountMap[model.Id] - item := toServiceItem(service.Kind(kind), model) + item := toServiceItem(model) item.ApiNum = apiCount item.CanDelete = apiCount == 0 items = append(items, item) @@ -242,7 +241,7 @@ func (i *imlServiceModule) Get(ctx context.Context, id string) (*service_dto.Ser return s, nil } -func (i *imlServiceModule) Search(ctx context.Context, teamID string, keyword string, kind string) ([]*service_dto.ServiceItem, error) { +func (i *imlServiceModule) Search(ctx context.Context, teamID string, keyword string) ([]*service_dto.ServiceItem, error) { var list []*service.Service var err error if teamID != "" { @@ -250,9 +249,9 @@ func (i *imlServiceModule) Search(ctx context.Context, teamID string, keyword st if err != nil { return nil, err } - list, err = i.serviceService.Search(ctx, keyword, map[string]interface{}{"team": teamID, "as_server": true, "kind": service.Kind(kind).Int()}, "update_at desc") + list, err = i.serviceService.Search(ctx, keyword, map[string]interface{}{"team": teamID, "as_server": true}, "update_at desc") } else { - list, err = i.serviceService.Search(ctx, keyword, map[string]interface{}{"as_server": true, "kind": service.Kind(kind).Int()}, "update_at desc") + list, err = i.serviceService.Search(ctx, keyword, map[string]interface{}{"as_server": true}, "update_at desc") } if err != nil { return nil, err @@ -270,7 +269,7 @@ func (i *imlServiceModule) Search(ctx context.Context, teamID string, keyword st items := make([]*service_dto.ServiceItem, 0, len(list)) for _, model := range list { apiCount := apiCountMap[model.Id] - item := toServiceItem(service.Kind(kind), model) + item := toServiceItem(model) item.ApiNum = apiCount item.CanDelete = apiCount == 0 items = append(items, item) @@ -278,7 +277,7 @@ func (i *imlServiceModule) Search(ctx context.Context, teamID string, keyword st return items, nil } -func toServiceItem(kind service.Kind, model *service.Service) *service_dto.ServiceItem { +func toServiceItem(model *service.Service) *service_dto.ServiceItem { item := &service_dto.ServiceItem{ Id: model.Id, Name: model.Name, @@ -286,8 +285,9 @@ func toServiceItem(kind service.Kind, model *service.Service) *service_dto.Servi CreateTime: auto.TimeLabel(model.CreateTime), UpdateTime: auto.TimeLabel(model.UpdateTime), Team: auto.UUID(model.Team), + ServiceKind: model.Kind.String(), } - switch kind { + switch model.Kind { case service.RestService: return item case service.AIService: @@ -315,19 +315,17 @@ func (i *imlServiceModule) Create(ctx context.Context, teamID string, input *ser Logo: input.Logo, ApprovalType: service.ApprovalType(input.ApprovalType), AdditionalConfig: make(map[string]string), + Kind: service.Kind(input.Kind), } if mo.ServiceType == service.PublicService && mo.Catalogue == "" { return nil, fmt.Errorf("catalogue can not be empty") } - if input.Kind != nil { - mo.Kind = service.Kind(*input.Kind) - switch mo.Kind { - case service.AIService: - if input.Provider == nil { - return nil, fmt.Errorf("ai service: provider can not be empty") - } - mo.AdditionalConfig["provider"] = *input.Provider + switch mo.Kind { + case service.AIService: + if input.Provider == nil { + return nil, fmt.Errorf("ai service: provider can not be empty") } + mo.AdditionalConfig["provider"] = *input.Provider } if input.AsApp == nil { // 默认值为false @@ -429,18 +427,8 @@ func (i *imlServiceModule) Edit(ctx context.Context, id string, input *service_d return i.Get(ctx, id) } -func (i *imlServiceModule) Delete(ctx context.Context, id string, kind string) error { - info, err := i.serviceService.Get(ctx, id) - if err != nil { - if errors.Is(err, gorm.ErrRecordNotFound) { - return nil - } - return err - } - if info.Kind.Int() != service.Kind(kind).Int() { - return fmt.Errorf("kind is not match") - } - err = i.transaction.Transaction(ctx, func(ctx context.Context) error { +func (i *imlServiceModule) Delete(ctx context.Context, id string) error { + err := i.transaction.Transaction(ctx, func(ctx context.Context) error { count, err := i.apiService.CountByService(ctx, id) if err != nil { return err diff --git a/module/service/module.go b/module/service/module.go index dc2494f3..900c5454 100644 --- a/module/service/module.go +++ b/module/service/module.go @@ -2,9 +2,10 @@ package service import ( "context" - "github.com/APIParkLab/APIPark/module/system" "reflect" + "github.com/APIParkLab/APIPark/module/system" + service_dto "github.com/APIParkLab/APIPark/module/service/dto" "github.com/eolinker/go-common/autowire" @@ -14,15 +15,15 @@ type IServiceModule interface { // Get 获取项目信息 Get(ctx context.Context, id string) (*service_dto.Service, error) // Search 搜索项目 - Search(ctx context.Context, teamID string, keyword string, kind string) ([]*service_dto.ServiceItem, error) - // SearchMyServicesByKind 搜索 - SearchMyServicesByKind(ctx context.Context, teamId string, keyword string, kind string) ([]*service_dto.ServiceItem, error) + Search(ctx context.Context, teamID string, keyword string) ([]*service_dto.ServiceItem, error) + // SearchMyServices 搜索 + SearchMyServices(ctx context.Context, teamId string, keyword string) ([]*service_dto.ServiceItem, error) // Create 创建 Create(ctx context.Context, teamID string, input *service_dto.CreateService) (*service_dto.Service, error) // Edit 编辑 Edit(ctx context.Context, id string, input *service_dto.EditService) (*service_dto.Service, error) // Delete 删除项目 - Delete(ctx context.Context, id string, kind string) error + Delete(ctx context.Context, id string) error // Simple 获取简易项目列表 //Simple(ctx context.Context, keyword string) ([]*service_dto.SimpleServiceItem, error) diff --git a/plugins/core/service.go b/plugins/core/service.go index e447e4d9..3d42ffba 100644 --- a/plugins/core/service.go +++ b/plugins/core/service.go @@ -20,12 +20,12 @@ func (p *plugin) ServiceApis() []pm3.Api { //pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/simple/services", []string{"context", "query:keyword"}, []string{"services"}, p.serviceController.Simple), // AI服务 - pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/ai-services", []string{"context", "query:service", "query:keyword"}, []string{"services"}, p.serviceController.SearchAIServices), - pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/team/ai-service", []string{"context", "query:team", "body"}, []string{"service"}, p.serviceController.CreateAIService), - pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/ai-service/info", []string{"context", "query:service", "body"}, []string{"service"}, p.serviceController.EditAIService), - pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/team/ai-service", []string{"context", "query:service"}, nil, p.serviceController.DeleteAIService), - pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/my_ai_services", []string{"context", "query:team", "query:keyword"}, []string{"services"}, p.serviceController.SearchMyAIServices), - pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/ai-service/info", []string{"context", "query:service"}, []string{"service"}, p.serviceController.Get), + //pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/ai-services", []string{"context", "query:service", "query:keyword"}, []string{"services"}, p.serviceController.SearchAIServices), + //pm3.CreateApiWidthDoc(http.MethodPost, "/api/v1/team/ai-service", []string{"context", "query:team", "body"}, []string{"service"}, p.serviceController.CreateAIService), + //pm3.CreateApiWidthDoc(http.MethodPut, "/api/v1/ai-service/info", []string{"context", "query:service", "body"}, []string{"service"}, p.serviceController.EditAIService), + //pm3.CreateApiWidthDoc(http.MethodDelete, "/api/v1/team/ai-service", []string{"context", "query:service"}, nil, p.serviceController.DeleteAIService), + //pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/my_ai_services", []string{"context", "query:team", "query:keyword"}, []string{"services"}, p.serviceController.SearchMyAIServices), + //pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/ai-service/info", []string{"context", "query:service"}, []string{"service"}, p.serviceController.Get), // 应用相关 pm3.CreateApiWidthDoc(http.MethodGet, "/api/v1/app/info", []string{"context", "query:app"}, []string{"app"}, p.appController.GetApp),