eolinker · Dot-Liu · Aug 12, 2024 · Jul 24, 2024 · Jul 24, 2024 · Jul 29, 2024
diff --git a/controller/api/api.go b/controller/api/api.go
@@ -1,38 +1,39 @@
 package api
 
 import (
-	"github.com/gin-gonic/gin"
 	"reflect"
 
+	"github.com/gin-gonic/gin"
+
 	"github.com/eolinker/go-common/autowire"
 
 	api_dto "github.com/eolinker/apipark/module/api/dto"
 )
 
 type IAPIController interface {
 	// Detail 获取API详情
-	Detail(ctx *gin.Context, pid string, aid string) (*api_dto.ApiDetail, error)
+	Detail(ctx *gin.Context, serviceId string, apiId string) (*api_dto.ApiDetail, error)
 	// SimpleDetail 获取API简要详情
-	SimpleDetail(ctx *gin.Context, pid string, aid string) (*api_dto.ApiSimpleDetail, error)
+	SimpleDetail(ctx *gin.Context, serviceId string, apiId string) (*api_dto.ApiSimpleDetail, error)
 	// Search 获取API列表
-	Search(ctx *gin.Context, keyword string, pid string) ([]*api_dto.ApiItem, error)
+	Search(ctx *gin.Context, keyword string, serviceId string) ([]*api_dto.ApiItem, error)
 	// SimpleSearch 获取API简要列表
-	SimpleSearch(ctx *gin.Context, keyword string, pid string) ([]*api_dto.ApiSimpleItem, error)
-	SimpleList(ctx *gin.Context, partitionId string, input *api_dto.ListInput) ([]*api_dto.ApiSimpleItem, error)
+	SimpleSearch(ctx *gin.Context, keyword string, serviceId string) ([]*api_dto.ApiSimpleItem, error)
+	//SimpleList(ctx *gin.Context, serviceId string) ([]*api_dto.ApiSimpleItem, error)
 	// Create 创建API
-	Create(ctx *gin.Context, pid string, dto *api_dto.CreateApi) (*api_dto.ApiSimpleDetail, error)
+	Create(ctx *gin.Context, serviceId string, dto *api_dto.CreateApi) (*api_dto.ApiSimpleDetail, error)
 	// Edit 编辑API
-	Edit(ctx *gin.Context, pid string, aid string, dto *api_dto.EditApi) (*api_dto.ApiSimpleDetail, error)
+	Edit(ctx *gin.Context, serviceId string, apiId string, dto *api_dto.EditApi) (*api_dto.ApiSimpleDetail, error)
 	// Delete 删除API
-	Delete(ctx *gin.Context, pid string, aid string) error
+	Delete(ctx *gin.Context, serviceId string, apiId string) error
 	// Copy 复制API
-	Copy(ctx *gin.Context, pid string, aid string, dto *api_dto.CreateApi) (*api_dto.ApiSimpleDetail, error)
+	Copy(ctx *gin.Context, serviceId string, apiId string, dto *api_dto.CreateApi) (*api_dto.ApiSimpleDetail, error)
 	// ApiDocDetail 获取API文档详情
-	ApiDocDetail(ctx *gin.Context, pid string, aid string) (*api_dto.ApiDocDetail, error)
+	ApiDocDetail(ctx *gin.Context, serviceId string, apiId string) (*api_dto.ApiDocDetail, error)
 	// ApiProxyDetail 获取API代理详情
-	ApiProxyDetail(ctx *gin.Context, pid string, aid string) (*api_dto.ApiProxyDetail, error)
+	ApiProxyDetail(ctx *gin.Context, serviceId string, apiId string) (*api_dto.ApiProxyDetail, error)
 	// Prefix 获取API前缀
-	Prefix(ctx *gin.Context, pid string) (string, bool, error)
+	Prefix(ctx *gin.Context, serviceId string) (string, bool, error)
 }
 
 func init() {

diff --git a/controller/api/iml.go b/controller/api/iml.go
@@ -12,52 +12,52 @@ type imlAPIController struct {
 	module api.IApiModule `autowired:""`
 }
 
-func (i *imlAPIController) SimpleList(ctx *gin.Context, partitionId string, input *api_dto.ListInput) ([]*api_dto.ApiSimpleItem, error) {
-	return i.module.SimpleList(ctx, partitionId, input)
-}
+//func (i *imlAPIController) SimpleList(ctx *gin.Context, serviceId string) ([]*api_dto.ApiSimpleItem, error) {
+//	return i.module.SimpleList(ctx, serviceId)
+//}
 
-func (i *imlAPIController) Detail(ctx *gin.Context, pid string, aid string) (*api_dto.ApiDetail, error) {
-	return i.module.Detail(ctx, pid, aid)
+func (i *imlAPIController) Detail(ctx *gin.Context, serviceId string, apiId string) (*api_dto.ApiDetail, error) {
+	return i.module.Detail(ctx, serviceId, apiId)
 }
 
-func (i *imlAPIController) SimpleDetail(ctx *gin.Context, pid string, aid string) (*api_dto.ApiSimpleDetail, error) {
-	return i.module.SimpleDetail(ctx, pid, aid)
+func (i *imlAPIController) SimpleDetail(ctx *gin.Context, serviceId string, apiId string) (*api_dto.ApiSimpleDetail, error) {
+	return i.module.SimpleDetail(ctx, serviceId, apiId)
 }
 
-func (i *imlAPIController) Search(ctx *gin.Context, keyword string, pid string) ([]*api_dto.ApiItem, error) {
-	return i.module.Search(ctx, keyword, pid)
+func (i *imlAPIController) Search(ctx *gin.Context, keyword string, serviceId string) ([]*api_dto.ApiItem, error) {
+	return i.module.Search(ctx, keyword, serviceId)
 }
 
-func (i *imlAPIController) SimpleSearch(ctx *gin.Context, keyword string, pid string) ([]*api_dto.ApiSimpleItem, error) {
-	return i.module.SimpleSearch(ctx, keyword, pid)
+func (i *imlAPIController) SimpleSearch(ctx *gin.Context, keyword string, serviceId string) ([]*api_dto.ApiSimpleItem, error) {
+	return i.module.SimpleSearch(ctx, keyword, serviceId)
 }
 
-func (i *imlAPIController) Create(ctx *gin.Context, pid string, dto *api_dto.CreateApi) (*api_dto.ApiSimpleDetail, error) {
-	return i.module.Create(ctx, pid, dto)
+func (i *imlAPIController) Create(ctx *gin.Context, serviceId string, dto *api_dto.CreateApi) (*api_dto.ApiSimpleDetail, error) {
+	return i.module.Create(ctx, serviceId, dto)
 }
 
-func (i *imlAPIController) Edit(ctx *gin.Context, pid string, aid string, dto *api_dto.EditApi) (*api_dto.ApiSimpleDetail, error) {
-	return i.module.Edit(ctx, pid, aid, dto)
+func (i *imlAPIController) Edit(ctx *gin.Context, serviceId string, apiId string, dto *api_dto.EditApi) (*api_dto.ApiSimpleDetail, error) {
+	return i.module.Edit(ctx, serviceId, apiId, dto)
 }
 
-func (i *imlAPIController) Delete(ctx *gin.Context, pid string, aid string) error {
-	return i.module.Delete(ctx, pid, aid)
+func (i *imlAPIController) Delete(ctx *gin.Context, serviceId string, apiId string) error {
+	return i.module.Delete(ctx, serviceId, apiId)
 }
 
-func (i *imlAPIController) Copy(ctx *gin.Context, pid string, aid string, dto *api_dto.CreateApi) (*api_dto.ApiSimpleDetail, error) {
-	return i.module.Copy(ctx, pid, aid, dto)
+func (i *imlAPIController) Copy(ctx *gin.Context, serviceId string, apiId string, dto *api_dto.CreateApi) (*api_dto.ApiSimpleDetail, error) {
+	return i.module.Copy(ctx, serviceId, apiId, dto)
 }
 
-func (i *imlAPIController) ApiDocDetail(ctx *gin.Context, pid string, aid string) (*api_dto.ApiDocDetail, error) {
-	return i.module.ApiDocDetail(ctx, pid, aid)
+func (i *imlAPIController) ApiDocDetail(ctx *gin.Context, serviceId string, apiId string) (*api_dto.ApiDocDetail, error) {
+	return i.module.ApiDocDetail(ctx, serviceId, apiId)
 }
 
-func (i *imlAPIController) ApiProxyDetail(ctx *gin.Context, pid string, aid string) (*api_dto.ApiProxyDetail, error) {
-	return i.module.ApiProxyDetail(ctx, pid, aid)
+func (i *imlAPIController) ApiProxyDetail(ctx *gin.Context, serviceId string, apiId string) (*api_dto.ApiProxyDetail, error) {
+	return i.module.ApiProxyDetail(ctx, serviceId, apiId)
 }
 
-func (i *imlAPIController) Prefix(ctx *gin.Context, pid string) (string, bool, error) {
-	prefix, err := i.module.Prefix(ctx, pid)
+func (i *imlAPIController) Prefix(ctx *gin.Context, serviceId string) (string, bool, error) {
+	prefix, err := i.module.Prefix(ctx, serviceId)
 	if err != nil {
 		return "", false, err
 	}

diff --git a/controller/application-authorization/authorization.go b/controller/application-authorization/authorization.go
@@ -0,0 +1,32 @@
+package application_authorization
+
+import (
+	"reflect"
+
+	"github.com/gin-gonic/gin"
+
+	"github.com/eolinker/go-common/autowire"
+
+	application_authorization_dto "github.com/eolinker/apipark/module/application-authorization/dto"
+)
+
+type IAuthorizationController interface {
+	// AddAuthorization 添加项目鉴权信息
+	AddAuthorization(ctx *gin.Context, pid string, info *application_authorization_dto.CreateAuthorization) (*application_authorization_dto.Authorization, error)
+	// EditAuthorization 修改项目鉴权信息
+	EditAuthorization(ctx *gin.Context, pid string, aid string, info *application_authorization_dto.EditAuthorization) (*application_authorization_dto.Authorization, error)
+	// DeleteAuthorization 删除项目鉴权
+	DeleteAuthorization(ctx *gin.Context, pid string, aid string) error
+	// Authorizations 获取项目鉴权列表
+	Authorizations(ctx *gin.Context, pid string) ([]*application_authorization_dto.AuthorizationItem, error)
+	// Detail 获取项目鉴权详情（弹窗用）
+	Detail(ctx *gin.Context, pid string, aid string) ([]application_authorization_dto.DetailItem, error)
+	// Info 获取项目鉴权详情
+	Info(ctx *gin.Context, pid string, aid string) (*application_authorization_dto.Authorization, error)
+}
+
+func init() {
+	autowire.Auto[IAuthorizationController](func() reflect.Value {
+		return reflect.ValueOf(new(imlAuthorizationController))
+	})
+}
diff --git a/controller/application-authorization/iml.go b/controller/application-authorization/iml.go
@@ -0,0 +1,37 @@
+package application_authorization
+
+import (
+	application_authorization "github.com/eolinker/apipark/module/application-authorization"
+	application_authorization_dto "github.com/eolinker/apipark/module/application-authorization/dto"
+	"github.com/gin-gonic/gin"
+)
+
+var _ IAuthorizationController = (*imlAuthorizationController)(nil)
+
+type imlAuthorizationController struct {
+	module application_authorization.IAuthorizationModule `autowired:""`
+}
+
+func (i *imlAuthorizationController) AddAuthorization(ctx *gin.Context, pid string, info *application_authorization_dto.CreateAuthorization) (*application_authorization_dto.Authorization, error) {
+	return i.module.AddAuthorization(ctx, pid, info)
+}
+
+func (i *imlAuthorizationController) EditAuthorization(ctx *gin.Context, pid string, aid string, info *application_authorization_dto.EditAuthorization) (*application_authorization_dto.Authorization, error) {
+	return i.module.EditAuthorization(ctx, pid, aid, info)
+}
+
+func (i *imlAuthorizationController) DeleteAuthorization(ctx *gin.Context, pid string, aid string) error {
+	return i.module.DeleteAuthorization(ctx, pid, aid)
+}
+
+func (i *imlAuthorizationController) Authorizations(ctx *gin.Context, pid string) ([]*application_authorization_dto.AuthorizationItem, error) {
+	return i.module.Authorizations(ctx, pid)
+}
+
+func (i *imlAuthorizationController) Detail(ctx *gin.Context, pid string, aid string) ([]application_authorization_dto.DetailItem, error) {
+	return i.module.Detail(ctx, pid, aid)
+}
+
+func (i *imlAuthorizationController) Info(ctx *gin.Context, pid string, aid string) (*application_authorization_dto.Authorization, error) {
+	return i.module.Info(ctx, pid, aid)
+}
diff --git a/controller/certificate/certificate.go b/controller/certificate/certificate.go
@@ -9,9 +9,9 @@ import (
 )
 
 type ICertificateController interface {
-	Create(ctx *gin.Context, partitionId string, create *certificate_dto.FileInput) error
+	Create(ctx *gin.Context, create *certificate_dto.FileInput) error
 	Update(ctx *gin.Context, id string, edit *certificate_dto.FileInput) error
-	ListForPartition(ctx *gin.Context, partitionId string) ([]*certificate_dto.Certificate, error)
+	ListForPartition(ctx *gin.Context) ([]*certificate_dto.Certificate, error)
 	Detail(ctx *gin.Context, id string) (*certificate_dto.Certificate, *certificate_dto.File, error)
 	Delete(ctx *gin.Context, id string) (string, error)
 }

diff --git a/controller/certificate/iml.go b/controller/certificate/iml.go
@@ -14,16 +14,16 @@ type imlCertificate struct {
 	module certificate.ICertificateModule `autowired:""`
 }
 
-func (c *imlCertificate) Create(ctx *gin.Context, partitionId string, create *certificate_dto.FileInput) error {
-	return c.module.Create(ctx, partitionId, create)
+func (c *imlCertificate) Create(ctx *gin.Context, create *certificate_dto.FileInput) error {
+	return c.module.Create(ctx, create)
 }
 
 func (c *imlCertificate) Update(ctx *gin.Context, id string, edit *certificate_dto.FileInput) error {
 	return c.module.Update(ctx, id, edit)
 }
 
-func (c *imlCertificate) ListForPartition(ctx *gin.Context, partitionId string) ([]*certificate_dto.Certificate, error) {
-	return c.module.ListForPartition(ctx, partitionId)
+func (c *imlCertificate) ListForPartition(ctx *gin.Context) ([]*certificate_dto.Certificate, error) {
+	return c.module.List(ctx)
 }
 
 func (c *imlCertificate) Detail(ctx *gin.Context, id string) (*certificate_dto.Certificate, *certificate_dto.File, error) {

diff --git a/controller/cluster/cluster.go b/controller/cluster/cluster.go
@@ -0,0 +1,22 @@
+package cluster
+
+import (
+	"reflect"
+
+	cluster_dto "github.com/eolinker/apipark/module/cluster/dto"
+
+	"github.com/eolinker/go-common/autowire"
+	"github.com/gin-gonic/gin"
+)
+
+type IClusterController interface {
+	Nodes(ctx *gin.Context, clusterId string) ([]*cluster_dto.Node, error)
+	ResetCluster(ctx *gin.Context, clusterId string, input *cluster_dto.ResetCluster) ([]*cluster_dto.Node, error)
+	Check(ctx *gin.Context, input *cluster_dto.CheckCluster) ([]*cluster_dto.Node, error)
+}
+
+func init() {
+	autowire.Auto[IClusterController](func() reflect.Value {
+		return reflect.ValueOf(new(imlCluster))
+	})
+}
diff --git a/controller/cluster/iml.go b/controller/cluster/iml.go
@@ -0,0 +1,73 @@
+package cluster
+
+import (
+	"github.com/eolinker/apipark/module/cluster"
+	cluster_dto "github.com/eolinker/apipark/module/cluster/dto"
+	"github.com/gin-gonic/gin"
+)
+
+var (
+	_ IClusterController = (*imlCluster)(nil)
+)
+
+type imlCluster struct {
+	module cluster.IClusterModule `autowired:""`
+}
+
+func (p *imlCluster) Nodes(ctx *gin.Context, clusterId string) ([]*cluster_dto.Node, error) {
+	if clusterId == "" {
+		clusterId = "default"
+	}
+	return p.module.ClusterNodes(ctx, clusterId)
+}
+
+func (p *imlCluster) ResetCluster(ctx *gin.Context, clusterId string, input *cluster_dto.ResetCluster) ([]*cluster_dto.Node, error) {
+	if clusterId == "" {
+		clusterId = "default"
+	}
+	return p.module.ResetCluster(ctx, clusterId, input.ManagerAddress)
+}
+
+func (p *imlCluster) Check(ctx *gin.Context, input *cluster_dto.CheckCluster) ([]*cluster_dto.Node, error) {
+	return p.module.CheckCluster(ctx, input.Address)
+}
+
+//
+//func (p *imlCluster) SimpleWithCluster(ctx *gin.Context) ([]*parition_dto.SimpleWithCluster, error) {
+//	return p.module.SimpleWithCluster(ctx)
+//}
+//
+//func (p *imlCluster) Delete(ctx *gin.Context, id string) (string, error) {
+//	err := p.module.Delete(ctx, id)
+//	if err != nil {
+//		return "", err
+//	}
+//	return id, nil
+//}
+//
+//func (p *imlCluster) Search(ctx *gin.Context, keyword string) ([]*parition_dto.Item, error) {
+//	return p.module.Search(ctx, keyword)
+//}
+//
+//func (p *imlCluster) Simple(ctx *gin.Context) ([]*parition_dto.Simple, error) {
+//	return p.module.Simple(ctx)
+//}
+//
+//func (p *imlCluster) Info(ctx *gin.Context, id string) (*parition_dto.Detail, error) {
+//	if id == "" {
+//		return nil, errors.New("id is empty")
+//	}
+//	return p.module.Get(ctx, id)
+//}
+//
+//func (p *imlCluster) Update(ctx *gin.Context, id string, input *parition_dto.Edit) (*parition_dto.Detail, error) {
+//	return p.module.Update(ctx, id, input)
+//}
+//
+//func (p *imlCluster) Create(ctx *gin.Context, input *parition_dto.Create) (*parition_dto.Detail, string, auto.TimeLabel, error) {
+//	detail, err := p.module.CreatePartition(ctx, input)
+//	if err != nil {
+//		return nil, "", auto.TimeLabel{}, err
+//	}
+//	return detail, detail.Id, detail.UpdateTime, nil
+//}
diff --git a/controller/dynamic-module/dynamic-module.go b/controller/dynamic-module/dynamic-module.go
@@ -16,10 +16,10 @@ type IDynamicModuleController interface {
 	List(ctx *gin.Context, module string, keyword string, cluster string, page string, pageSize string) ([]map[string]interface{}, *dynamic_module_dto.PluginInfo, int64, error)
 	Render(ctx *gin.Context, module string) (*dynamic_module_dto.PluginBasic, map[string]interface{}, error)
 	ModuleDrivers(ctx *gin.Context, group string) ([]*dynamic_module_dto.ModuleDriver, error)
-	Online(ctx *gin.Context, module string, id string, partitionInput *dynamic_module_dto.PartitionInput) error
-	Offline(ctx *gin.Context, module string, id string, partitionInput *dynamic_module_dto.PartitionInput) error
-	PartitionStatuses(ctx *gin.Context, module string, keyword string, page string, pageSize string) (map[string]map[string]string, error)
-	PartitionStatus(ctx *gin.Context, module string, id string) (*dynamic_module_dto.OnlineInfo, error)
+	Online(ctx *gin.Context, module string, id string, partitionInput *dynamic_module_dto.ClusterInput) error
+	Offline(ctx *gin.Context, module string, id string, partitionInput *dynamic_module_dto.ClusterInput) error
+	//PartitionStatuses(ctx *gin.Context, module string, keyword string, page string, pageSize string) (map[string]map[string]string, error)
+	//PartitionStatus(ctx *gin.Context, module string, id string) (*dynamic_module_dto.OnlineInfo, error)
 }
 
 func init() {