finish data mask strategy

controller/monitor/iml.go

@@ -17,6 +17,70 @@ type imlMonitorStatisticController struct {
 	module monitor.IMonitorStatisticModule `autowired:""`
 }
 
+func (i *imlMonitorStatisticController) Statistics(ctx *gin.Context, dataType string, input *monitor_dto.StatisticInput) (interface{}, error) {
+	switch dataType {
+	case monitor_dto.DataTypeApi:
+		return i.module.ApiStatistics(ctx, input)
+	case monitor_dto.DataTypeProvider:
+		return i.module.ProviderStatistics(ctx, input)
+	case monitor_dto.DataTypeSubscriber:
+		return i.module.SubscriberStatistics(ctx, input)
+	default:
+		return nil, fmt.Errorf("unsupported data type: %s", dataType)
+	}
+}
+
+func (i *imlMonitorStatisticController) InvokeTrend(ctx *gin.Context, dataType string, id string, input *monitor_dto.CommonInput) (*monitor_dto.MonInvokeCountTrend, string, error) {
+	switch dataType {
+	case monitor_dto.DataTypeApi:
+		return i.module.APITrend(ctx, id, input)
+	case monitor_dto.DataTypeProvider:
+		return i.module.ProviderTrend(ctx, id, input)
+	case monitor_dto.DataTypeSubscriber:
+		return i.module.SubscriberTrend(ctx, id, input)
+	default:
+		return nil, "", fmt.Errorf("unsupported data type: %s", dataType)
+	}
+}
+
+func (i *imlMonitorStatisticController) InvokeTrendInner(ctx *gin.Context, dataType string, typ string, api string, provider string, subscriber string, input *monitor_dto.CommonInput) (*monitor_dto.MonInvokeCountTrend, string, error) {
+	if dataType == monitor_dto.DataTypeApi && typ == monitor_dto.DataTypeSubscriber || dataType == monitor_dto.DataTypeSubscriber && typ == monitor_dto.DataTypeApi {
+		return i.module.InvokeTrendWithSubscriberAndApi(ctx, api, subscriber, input)
+	} else if dataType == monitor_dto.DataTypeApi && typ == monitor_dto.DataTypeProvider || dataType == monitor_dto.DataTypeProvider && typ == monitor_dto.DataTypeApi {
+		return i.module.InvokeTrendWithProviderAndApi(ctx, provider, api, input)
+	}
+	return nil, "", fmt.Errorf("unsupported detail type: %s, data type is %s", typ, dataType)
+}
+
+func (i *imlMonitorStatisticController) StatisticsInner(ctx *gin.Context, dataType string, typ string, id string, input *monitor_dto.StatisticInput) (interface{}, error) {
+	switch dataType {
+	case monitor_dto.DataTypeApi:
+		switch typ {
+		case monitor_dto.DataTypeProvider:
+			return i.module.ProviderStatisticsOnApi(ctx, id, input)
+		case monitor_dto.DataTypeSubscriber:
+			return i.module.SubscriberStatisticsOnApi(ctx, id, input)
+		default:
+			return nil, fmt.Errorf("unsupported detail type: %s, data type is %s", typ, dataType)
+		}
+	case monitor_dto.DataTypeProvider:
+		switch typ {
+		case monitor_dto.DataTypeApi:
+			return i.module.ApiStatisticsOnProvider(ctx, id, input)
+		default:
+			return nil, fmt.Errorf("unsupported detail type: %s, data type is %s", typ, dataType)
+		}
+	case monitor_dto.DataTypeSubscriber:
+		switch typ {
+		case monitor_dto.DataTypeApi:
+			return i.module.ApiStatisticsOnSubscriber(ctx, id, input)
+		default:
+			return nil, fmt.Errorf("unsupported detail type: %s, data type is %s", typ, dataType)
+		}
+	}
+	return nil, fmt.Errorf("unsupported data type: %s", dataType)
+}
+
 func (i *imlMonitorStatisticController) OverviewMessageTrend(ctx *gin.Context, input *monitor_dto.CommonInput) ([]time.Time, []float64, []float64, string, error) {
 	trend, timeInterval, err := i.module.MessageTrend(ctx, input)
 	if err != nil {

controller/monitor/statistic.go

@@ -16,7 +16,12 @@ type IMonitorStatisticController interface {
 	OverviewInvokeTrend(ctx *gin.Context, input *monitor_dto.CommonInput) ([]time.Time, []int64, []int64, []int64, []int64, []float64, []float64, string, error)
 	OverviewMessageTrend(ctx *gin.Context, input *monitor_dto.CommonInput) ([]time.Time, []float64, []float64, string, error)
 
-	//Statistics(ctx *gin.Context, dataType string, input *monitor_dto.StatisticInput) (interface{}, error)
+	Statistics(ctx *gin.Context, dataType string, input *monitor_dto.StatisticInput) (interface{}, error)
+
+	InvokeTrend(ctx *gin.Context, dataType string, id string, input *monitor_dto.CommonInput) (*monitor_dto.MonInvokeCountTrend, string, error)
+
+	InvokeTrendInner(ctx *gin.Context, dataType string, typ string, api string, provider string, subscriber string, input *monitor_dto.CommonInput) (*monitor_dto.MonInvokeCountTrend, string, error)
+	StatisticsInner(ctx *gin.Context, dataType string, typ string, id string, input *monitor_dto.StatisticInput) (interface{}, error)
 }
 
 type IMonitorConfigController interface {

controller/service/iml.go

@@ -7,6 +7,8 @@ import (
 	"strings"
 	"time"
 
+	upstream_dto "github.com/APIParkLab/APIPark/module/upstream/dto"
+
 	"github.com/eolinker/eosc/log"
 
 	application_authorization "github.com/APIParkLab/APIPark/module/application-authorization"
@@ -25,7 +27,6 @@ import (
 	"github.com/APIParkLab/APIPark/module/service"
 	service_dto "github.com/APIParkLab/APIPark/module/service/dto"
 	"github.com/APIParkLab/APIPark/module/upstream"
-	upstream_dto "github.com/APIParkLab/APIPark/module/upstream/dto"
 	"github.com/eolinker/go-common/store"
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
@@ -47,24 +48,12 @@ type imlServiceController struct {
 	transaction    store.ITransaction        `autowired:""`
 }
 
-func newAIUpstream(id string, provider string, uri model_runtime.IProviderURI) *upstream_dto.Upstream {
-	return &upstream_dto.Upstream{
-		Type:            "http",
-		Balance:         "round-robin",
-		Timeout:         300000,
-		Retry:           0,
-		Remark:          fmt.Sprintf("auto create by ai service %s,provider is %s", id, provider),
-		LimitPeerSecond: 0,
-		ProxyHeaders:    nil,
-		Scheme:          uri.Scheme(),
-		PassHost:        "node",
-		Nodes: []*upstream_dto.NodeConfig{
-			{
-				Address: uri.Host(),
-				Weight:  100,
-			},
-		},
-	}
+func (i *imlServiceController) Simple(ctx *gin.Context) ([]*service_dto.SimpleServiceItem, error) {
+	return i.module.Simple(ctx)
+}
+
+func (i *imlServiceController) MySimple(ctx *gin.Context) ([]*service_dto.SimpleServiceItem, error) {
+	return i.module.MySimple(ctx)
 }
 
 func (i *imlServiceController) editAIService(ctx *gin.Context, id string, input *service_dto.EditService) (*service_dto.Service, error) {
@@ -228,21 +217,12 @@ func (i *imlServiceController) SearchMyServices(ctx *gin.Context, teamId string,
 	return i.module.SearchMyServices(ctx, teamId, keyword)
 }
 
-//func (i *imlServiceController) Simple(ctx *gin.Context, keyword string) ([]*service_dto.SimpleServiceItem, error) {
-//	return i.module.Simple(ctx, keyword)
-//}
-//
-//func (i *imlServiceController) MySimple(ctx *gin.Context, keyword string) ([]*service_dto.SimpleServiceItem, error) {
-//	return i.module.MySimple(ctx, keyword)
-//}
-
 func (i *imlServiceController) Get(ctx *gin.Context, id string) (*service_dto.Service, error) {
 	now := time.Now()
 	defer func() {
 		log.Infof("get service %s cost %d ms", id, time.Since(now).Milliseconds())
 	}()
 	return i.module.Get(ctx, id)
-
 }
 
 func (i *imlServiceController) Search(ctx *gin.Context, teamID string, keyword string) ([]*service_dto.ServiceItem, error) {
@@ -336,3 +316,23 @@ func (i *imlAppController) GetApp(ctx *gin.Context, appId string) (*service_dto.
 func (i *imlAppController) DeleteApp(ctx *gin.Context, appId string) error {
 	return i.module.DeleteApp(ctx, appId)
 }
+
+func newAIUpstream(id string, provider string, uri model_runtime.IProviderURI) *upstream_dto.Upstream {
+	return &upstream_dto.Upstream{
+		Type:            "http",
+		Balance:         "round-robin",
+		Timeout:         300000,
+		Retry:           0,
+		Remark:          fmt.Sprintf("auto create by ai service %s,provider is %s", id, provider),
+		LimitPeerSecond: 0,
+		ProxyHeaders:    nil,
+		Scheme:          uri.Scheme(),
+		PassHost:        "node",
+		Nodes: []*upstream_dto.NodeConfig{
+			{
+				Address: uri.Host(),
+				Weight:  100,
+			},
+		},
+	}
+}

controller/service/service.go

@@ -24,12 +24,8 @@ type IServiceController interface {
 	Delete(ctx *gin.Context, id string) error
 	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)
+	Simple(ctx *gin.Context) ([]*service_dto.SimpleServiceItem, error)
+	MySimple(ctx *gin.Context) ([]*service_dto.SimpleServiceItem, error)
 }
 
 type IAppController interface {

controller/strategy/iml.go

@@ -1,9 +1,16 @@
 package strategy
 
 import (
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"sort"
 	"strconv"
+	"time"
+
+	"github.com/eolinker/go-common/utils"
+
+	strategy_filter "github.com/APIParkLab/APIPark/strategy-filter"
 
 	"github.com/APIParkLab/APIPark/module/service"
 	"github.com/APIParkLab/APIPark/module/strategy"
@@ -18,6 +25,105 @@ type imlStrategyController struct {
 	serviceModule  service.IServiceModule   `autowired:""`
 }
 
+func (i *imlStrategyController) ToPublish(ctx *gin.Context, driver string) ([]*strategy_dto.ToPublishItem, string, string, bool, error) {
+	list, err := i.strategyModule.ToPublish(ctx, driver)
+	if err != nil {
+		return nil, "", "", false, err
+	}
+	data, _ := json.Marshal(list)
+	source := base64.StdEncoding.EncodeToString(data)
+	return list, source, time.Now().Format("20060102150405") + "-release", len(list) > 0, nil
+}
+
+func (i *imlStrategyController) FilterGlobalRemote(ctx *gin.Context, name string) ([]*strategy_dto.Title, []any, int64, string, string, error) {
+	f, has := strategy_filter.RemoteFilter(name)
+	if !has {
+		return nil, nil, 0, "", "", fmt.Errorf("filter not found: %s", name)
+	}
+	scopeAllow := false
+	for _, s := range f.Scopes() {
+		if s == strategy_filter.ScopeGlobal {
+			scopeAllow = true
+			break
+		}
+	}
+	if !scopeAllow {
+		return nil, nil, 0, "", "", fmt.Errorf("scope not allowed: %s", name)
+	}
+
+	list, total, err := f.RemoteList(ctx, "", nil, -1, -1)
+	if err != nil {
+		return nil, nil, 0, "", "", err
+	}
+	return utils.SliceToSlice(f.Titles(), func(l strategy_filter.OptionTitle) *strategy_dto.Title {
+		return &strategy_dto.Title{
+			Field: l.Field,
+			Title: l.Title,
+		}
+	}), list, total, f.Key(), f.Key(), nil
+}
+
+func (i *imlStrategyController) FilterServiceRemote(ctx *gin.Context, serviceId string, name string) ([]*strategy_dto.Title, []any, int64, string, string, error) {
+	f, has := strategy_filter.RemoteFilter(name)
+	if !has {
+		return nil, nil, 0, "", "", fmt.Errorf("filter not found: %s", name)
+	}
+	scopeAllow := false
+	for _, s := range f.Scopes() {
+		if s == strategy_filter.ScopeService {
+			scopeAllow = true
+			break
+		}
+	}
+	if !scopeAllow {
+		return nil, nil, 0, "", "", fmt.Errorf("scope not allowed: %s", name)
+	}
+	list, total, err := f.RemoteList(ctx, "", map[string]interface{}{"service": serviceId}, -1, -1)
+	if err != nil {
+		return nil, nil, 0, "", "", err
+	}
+	return utils.SliceToSlice(f.Titles(), func(l strategy_filter.OptionTitle) *strategy_dto.Title {
+		return &strategy_dto.Title{
+			Field: l.Field,
+			Title: l.Title,
+		}
+	}), list, total, f.Key(), "list", nil
+
+}
+
+func (i *imlStrategyController) filterOptions(ctx *gin.Context, scope string) ([]*strategy_dto.FilterOption, error) {
+	m, has := strategy_filter.Options(scope)
+	if !has {
+		return nil, fmt.Errorf("scope not found: %s", scope)
+	}
+
+	list := utils.MapToSlice(m, func(key string, value *strategy_filter.Option) *strategy_dto.FilterOption {
+		pattern := ""
+		if value.Pattern != nil {
+			pattern = value.Pattern.String()
+		}
+		return &strategy_dto.FilterOption{
+			Name:    value.Name,
+			Title:   value.Title,
+			Type:    value.Type,
+			Pattern: pattern,
+			Options: value.Options,
+		}
+	})
+	sort.Slice(list, func(i, j int) bool {
+		return list[i].Name < list[j].Name
+	})
+	return list, nil
+}
+
+func (i *imlStrategyController) FilterServiceOptions(ctx *gin.Context) ([]*strategy_dto.FilterOption, error) {
+	return i.filterOptions(ctx, strategy_filter.ScopeService)
+}
+
+func (i *imlStrategyController) FilterGlobalOptions(ctx *gin.Context) ([]*strategy_dto.FilterOption, error) {
+	return i.filterOptions(ctx, strategy_filter.ScopeGlobal)
+}
+
 func (i *imlStrategyController) GetStrategy(ctx *gin.Context, id string) (*strategy_dto.Strategy, error) {
 	return i.strategyModule.Get(ctx, id)
 }
@@ -51,18 +157,18 @@ func (i *imlStrategyController) search(ctx *gin.Context, keyword string, scope s
 
 func (i *imlStrategyController) GlobalStrategyList(ctx *gin.Context, keyword string, driver string, page string, pageSize string, order string, sort string, filters string) ([]*strategy_dto.StrategyItem, int64, error) {
 
-	return i.search(ctx, keyword, strategy_dto.ToScope(strategy_dto.ScopeSystem), "", driver, page, pageSize, order, sort, filters)
+	return i.search(ctx, keyword, strategy_dto.ToScope(strategy_dto.ScopeGlobal), "", driver, page, pageSize, order, sort, filters)
 }
 
 func (i *imlStrategyController) CreateGlobalStrategy(ctx *gin.Context, driver string, input *strategy_dto.Create) error {
 	input.Driver = driver
-	input.Scope = strategy_dto.ToScope(strategy_dto.ScopeSystem)
+	input.Scope = strategy_dto.ToScope(strategy_dto.ScopeGlobal)
 
 	return i.strategyModule.Create(ctx, input)
 }
 
-func (i *imlStrategyController) PublishGlobalStrategy(ctx *gin.Context) error {
-	return i.strategyModule.Publish(ctx, strategy_dto.ScopeSystem, "")
+func (i *imlStrategyController) PublishGlobalStrategy(ctx *gin.Context, driver string) error {
+	return i.strategyModule.Publish(ctx, driver, strategy_dto.ScopeGlobal, "")
 }
 
 func (i *imlStrategyController) ServiceStrategyList(ctx *gin.Context, keyword string, serviceId string, driver string, page string, pageSize string, order string, sort string, filters string) ([]*strategy_dto.StrategyItem, int64, error) {
@@ -87,7 +193,7 @@ func (i *imlStrategyController) EditStrategy(ctx *gin.Context, id string, input
 }
 
 func (i *imlStrategyController) EnableStrategy(ctx *gin.Context, id string) error {
-	return i.EnableStrategy(ctx, id)
+	return i.strategyModule.Enable(ctx, id)
 }
 
 func (i *imlStrategyController) DisableStrategy(ctx *gin.Context, id string) error {

controller/strategy/strategy.go

@@ -11,7 +11,7 @@ import (
 type IStrategyController interface {
 	GlobalStrategyList(ctx *gin.Context, keyword string, driver string, page string, pageSize string, order string, sort string, filters string) ([]*strategy_dto.StrategyItem, int64, error)
 	CreateGlobalStrategy(ctx *gin.Context, driver string, input *strategy_dto.Create) error
-	PublishGlobalStrategy(ctx *gin.Context) error
+	PublishGlobalStrategy(ctx *gin.Context, driver string) error
 
 	ServiceStrategyList(ctx *gin.Context, keyword string, serviceId string, driver string, page string, pageSize string, order string, sort string, filters string) ([]*strategy_dto.StrategyItem, int64, error)
 	CreateServiceStrategy(ctx *gin.Context, serviceId string, driver string, input *strategy_dto.Create) error
@@ -22,6 +22,14 @@ type IStrategyController interface {
 	DisableStrategy(ctx *gin.Context, id string) error
 
 	DeleteStrategy(ctx *gin.Context, id string) error
+
+	FilterGlobalOptions(ctx *gin.Context) ([]*strategy_dto.FilterOption, error)
+	FilterServiceOptions(ctx *gin.Context) ([]*strategy_dto.FilterOption, error)
+
+	FilterGlobalRemote(ctx *gin.Context, name string) ([]*strategy_dto.Title, []any, int64, string, string, error)
+	FilterServiceRemote(ctx *gin.Context, serviceId string, name string) ([]*strategy_dto.Title, []any, int64, string, string, error)
+
+	ToPublish(ctx *gin.Context, driver string) ([]*strategy_dto.ToPublishItem, string, string, bool, error)
 }
 
 type IStrategyCommonController interface {