devcloud/.vscode/launch.json

@@ -5,7 +5,7 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "devcloud api server",
+            "name": "mcenter api server",
             "type": "go",
             "request": "launch",
             "mode": "auto",

devcloud/audit/apps/event/consumer/impl.go

@@ -58,6 +58,7 @@ func (i *consumer) Priority() int {
 	return event.PRIORITY - 1
 }
 
-func (i *consumer) Close(ctx context.Context) {
+func (i *consumer) Close(ctx context.Context) error {
 	i.ctx.Done()
+	return nil
 }

devcloud/cmdb/README.md

@@ -1,14 +1,2 @@
 # 资源管理
 
-## CMDB需求介绍
-
-公司所有的资产(ITMS), 运维管理的资产(虚拟机), 为这些资产提供维护(日志清理, 安全检查, 监控告警, ...), Excel
-
-1. 维护麻烦, 静态的, 每次变更都需要人为把信息同步给其他系统。
-2. 没法通过API提供数据给其他系统, 没法做系统集成, 系统化程度低。
-
-
-大的数据库，通过为这些数据提供API, 实现数据的 高速集成, 数据一定准确
-
-## 常见的CMDB设计模式
-

devcloud/cmdb/apps/registry.go

@@ -1,7 +0,0 @@
-package apps
-
-import (
-	_ "122.51.31.227/go-course/go18/devcloud/cmdb/apps/resource/impl"
-	_ "122.51.31.227/go-course/go18/devcloud/cmdb/apps/secret/impl"
-	_ "122.51.31.227/go-course/go18/devcloud/cmdb/apps/secret/sync"
-)

devcloud/cmdb/apps/resource/README.md

@@ -1,2 +0,0 @@
-# 资源管理模块
-

devcloud/cmdb/apps/resource/api/api.go

@@ -1 +0,0 @@
-package api

devcloud/cmdb/apps/resource/enum.go

@@ -1,34 +0,0 @@
-package resource
-
-const (
-	VENDOR_ALIYUN  VENDOR = "ali"
-	VENDOR_TENCENT VENDOR = "tx"
-	VENDOR_HUAWEI  VENDOR = "hw"
-	VENDOR_VMWARE  VENDOR = "vmware"
-	VENDOR_AWS     VENDOR = "aws"
-)
-
-type VENDOR string
-
-const (
-	// 业务资源
-	TYPE_VM      TYPE = "vm"
-	TYPE_RDS     TYPE = "rds"
-	TYPE_REDIS   TYPE = "redis"
-	TYPE_BUCKET  TYPE = "bucket"
-	TYPE_DISK    TYPE = "disk"
-	TYPE_LB      TYPE = "lb"
-	TYPE_DOMAIN  TYPE = "domain"
-	TYPE_EIP     TYPE = "eip"
-	TYPE_MONGODB TYPE = "mongodb"
-	// 子资源
-	TYPE_DATABASE TYPE = "database"
-	TYPE_ACCOUNT  TYPE = "account"
-	// 未知资源
-	TYPE_OTHER TYPE = "other"
-	// 辅助资源
-	TYPE_BILL  TYPE = "bill"
-	TYPE_ORDER TYPE = "order"
-)
-
-type TYPE string

devcloud/cmdb/apps/resource/impl/impl.go

@@ -1,31 +0,0 @@
-package impl
-
-import (
-	"122.51.31.227/go-course/go18/devcloud/cmdb/apps/resource"
-	"github.com/infraboard/mcube/v2/ioc"
-	"github.com/infraboard/mcube/v2/ioc/config/datasource"
-)
-
-func init() {
-	ioc.Controller().Registry(&ResourceServiceImpl{})
-}
-
-var _ resource.Service = (*ResourceServiceImpl)(nil)
-
-type ResourceServiceImpl struct {
-	ioc.ObjectImpl
-}
-
-func (s *ResourceServiceImpl) Name() string {
-	return resource.APP_NAME
-}
-
-func (s *ResourceServiceImpl) Init() error {
-	if datasource.Get().AutoMigrate {
-		err := datasource.DB().AutoMigrate(&resource.Resource{})
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}

devcloud/cmdb/apps/resource/impl/resource.go

@@ -1,28 +0,0 @@
-package impl
-
-import (
-	"context"
-
-	"122.51.31.227/go-course/go18/devcloud/cmdb/apps/resource"
-	"github.com/infraboard/mcube/v2/ioc/config/datasource"
-	"github.com/infraboard/mcube/v2/types"
-)
-
-// Add implements resource.Service.
-func (s *ResourceServiceImpl) Add(ctx context.Context, in *resource.Resource) (*resource.Resource, error) {
-	if err := datasource.DBFromCtx(ctx).Save(in).Error; err != nil {
-		return nil, err
-	}
-
-	return in, nil
-}
-
-// DeleteResource implements resource.Service.
-func (s *ResourceServiceImpl) DeleteResource(ctx context.Context, in *resource.DeleteResourceRequest) error {
-	panic("unimplemented")
-}
-
-// Search implements resource.Service.
-func (s *ResourceServiceImpl) Search(ctx context.Context, in *resource.SearchRequest) (*types.Set[*resource.Resource], error) {
-	panic("unimplemented")
-}

devcloud/cmdb/apps/resource/interface.go

@@ -1,60 +0,0 @@
-package resource
-
-import (
-	"context"
-
-	"github.com/infraboard/mcube/v2/http/request"
-	"github.com/infraboard/mcube/v2/ioc"
-	"github.com/infraboard/mcube/v2/types"
-)
-
-const (
-	APP_NAME = "resource"
-)
-
-func GetService() Service {
-	return ioc.Controller().Get(APP_NAME).(Service)
-}
-
-type Service interface {
-	// 资源搜索
-	Search(context.Context, *SearchRequest) (*types.Set[*Resource], error)
-	// Save 更新与创建同时
-	Add(context.Context, *Resource) (*Resource, error)
-	// 删除
-	DeleteResource(context.Context, *DeleteResourceRequest) error
-}
-
-// NewSearchRequest().SetType(”).SetXXX(v)
-// (WithOptz(), WithOptx(), WithOpty()...)
-func NewSearchRequest() *SearchRequest {
-	return &SearchRequest{
-		PageRequest: request.NewDefaultPageRequest(),
-		Tags:        map[string]string{},
-	}
-}
-
-type SearchRequest struct {
-	// 分页请求
-	*request.PageRequest
-	// 名称做模糊搜索
-	Keywords string `json:"keywords"`
-	// 类型
-	Type *TYPE `json:"type"`
-	// 标签
-	Tags map[string]string `json:"lable"`
-}
-
-func (r *SearchRequest) SetType(t TYPE) *SearchRequest {
-	r.Type = &t
-	return r
-}
-
-func NewDeleteResourceRequest() *DeleteResourceRequest {
-	return &DeleteResourceRequest{}
-}
-
-// 支持多个
-type DeleteResourceRequest struct {
-	ResourceIds []string `json:"resource_ids"`
-}

devcloud/cmdb/apps/resource/model.go

@@ -1,130 +0,0 @@
-package resource
-
-import (
-	"github.com/infraboard/mcube/v2/tools/pretty"
-	"github.com/infraboard/mcube/v2/types"
-)
-
-func NewResourceSet() *types.Set[*Resource] {
-	return types.New[*Resource]()
-}
-
-func NewResource() *Resource {
-	return &Resource{
-		Meta: Meta{},
-		Spec: Spec{
-			Tags:  map[string]string{},
-			Extra: map[string]string{},
-		},
-		Status: Status{},
-	}
-}
-
-// 资源
-// https://www.mongodb.com/docs/drivers/go/current/fundamentals/bson/#struct-tags
-type Resource struct {
-	Meta   `bson:"inline"`
-	Spec   `bson:"inline"`
-	Status `bson:"inline"`
-}
-
-func (r *Resource) String() string {
-	return pretty.ToJSON(r)
-}
-
-func (r *Resource) TableName() string {
-	return "resources"
-}
-
-// 元数据，不会变的
-type Meta struct {
-	// 全局唯一Id, 直接使用个云商自己的Id
-	Id string `bson:"_id" json:"id" validate:"required" gorm:"column:id;primaryKey"`
-	// 资源所属域
-	Domain string `json:"domain" validate:"required" gorm:"column:domain"`
-	// 资源所属空间
-	Namespace string `json:"namespace" validate:"required" gorm:"column:namespace"`
-	// 资源所属环境
-	Env string `json:"env" gorm:"column:env"`
-	// 创建时间
-	CreateAt int64 `json:"create_at" gorm:"column:create_at"`
-	// 删除时间
-	DeteteAt int64 `json:"detete_at" gorm:"column:detete_at"`
-	// 删除人
-	DeteteBy string `json:"detete_by" gorm:"column:detete_by"`
-	// 同步时间
-	SyncAt int64 `json:"sync_at" validate:"required" gorm:"column:sync_at"`
-	// 同步人
-	SyncBy string `json:"sync_by" gorm:"column:sync_by"`
-	// 用于同步的凭证ID
-	CredentialId string `json:"credential_id" gorm:"column:credential_id"`
-	// 序列号
-	SerialNumber string `json:"serial_number" gorm:"column:serial_number"`
-}
-
-// 表单数据, 用户申请资源时 需要提供的参数
-type Spec struct {
-	// 厂商
-	Vendor VENDOR `json:"vendor" gorm:"column:vendor"`
-	// 资源类型
-	ResourceType TYPE `json:"resource_type" gorm:"column:resource_type"`
-	// 地域
-	Region string `json:"region" gorm:"column:region"`
-	// 区域
-	Zone string `json:"zone" gorm:"column:zone"`
-	// 资源所属账号
-	Owner string `json:"owner" gorm:"column:owner"`
-	// 名称
-	Name string `json:"name" gorm:"column:name"`
-	// 种类
-	Category string `json:"category" gorm:"column:category"`
-	// 规格
-	Type string `json:"type" gorm:"column:type"`
-	// 描述
-	Description string `json:"description" gorm:"column:description"`
-	// 过期时间
-	ExpireAt int64 `json:"expire_at" gorm:"column:expire_at"`
-	// 更新时间
-	UpdateAt int64 `json:"update_at" gorm:"column:update_at"`
-	// 资源占用Cpu数量
-	Cpu int64 `json:"cpu" gorm:"column:cpu"`
-	// GPU数量
-	Gpu int64 `json:"gpu" gorm:"column:gpu"`
-	// 资源使用的内存
-	Memory int64 `json:"memory" gorm:"column:memory"`
-	// 系统盘
-	SystemStorage int64 `json:"system_storage" gorm:"column:system_storage"`
-	// 数据盘
-	DataStorage int64 `json:"data_storage" gorm:"column:data_storage"`
-	// 公网IP带宽, 单位M
-	BandWidth int32 `json:"band_width" gorm:"column:band_width"`
-	// 资源标签
-	Tags map[string]string `json:"tags" gorm:"column:tags;serializer:json;type:json"`
-	// 额外的通用属性
-	Extra map[string]string `json:"extra" gorm:"column:extra;serializer:json;type:json"`
-}
-
-// 资源当前状态
-type Status struct {
-	// 资源当前状态
-	Phase string `json:"phase" gorm:"column:phase"`
-	// 资源当前状态描述
-	Describe string `json:"describe" gorm:"column:describe"`
-	// 实例锁定模式; Unlock：正常；ManualLock：手动触发锁定；LockByExpiration：实例过期自动锁定；LockByRestoration：实例回滚前的自动锁定；LockByDiskQuota：实例空间满自动锁定
-	LockMode string `json:"lock_mode" gorm:"column:lock_mode"`
-	// 锁定原因
-	LockReason string `json:"lock_reason" gorm:"column:lock_reason"`
-	// 资源访问地址
-	// 公网地址, 或者域名
-	PublicAddress []string `json:"public_address" gorm:"column:public_address;serializer:json;type:json"`
-	// 内网地址, 或者域名
-	PrivateAddress []string `json:"private_address" gorm:"column:private_address;serializer:json;type:json"`
-}
-
-func (s *Status) GetFirstPrivateAddress() string {
-	if len(s.PrivateAddress) > 0 {
-		return s.PrivateAddress[0]
-	}
-
-	return ""
-}

devcloud/cmdb/apps/secret/README.md

@@ -1,2 +0,0 @@
-# 资源凭证管理
-

devcloud/cmdb/apps/secret/api/api.go

@@ -1 +0,0 @@
-package api

devcloud/cmdb/apps/secret/const.go

@@ -1,5 +0,0 @@
-package secret
-
-const (
-	TASK_LABLE_SECRET_ID = "secret_id"
-)

devcloud/cmdb/apps/secret/impl/impl.go

@@ -1,31 +0,0 @@
-package impl
-
-import (
-	"122.51.31.227/go-course/go18/devcloud/cmdb/apps/secret"
-	"github.com/infraboard/mcube/v2/ioc"
-	"github.com/infraboard/mcube/v2/ioc/config/datasource"
-)
-
-func init() {
-	ioc.Controller().Registry(&SecretServiceImpl{})
-}
-
-var _ secret.Service = (*SecretServiceImpl)(nil)
-
-type SecretServiceImpl struct {
-	ioc.ObjectImpl
-}
-
-func (s *SecretServiceImpl) Name() string {
-	return secret.APP_NAME
-}
-
-func (s *SecretServiceImpl) Init() error {
-	if datasource.Get().AutoMigrate {
-		err := datasource.DB().AutoMigrate(&secret.Secret{})
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}

devcloud/cmdb/apps/secret/impl/impl_test.go

@@ -1,15 +0,0 @@
-package impl_test
-
-import (
-	"122.51.31.227/go-course/go18/devcloud/cmdb/apps/secret"
-	"122.51.31.227/go-course/go18/devcloud/cmdb/test"
-)
-
-var (
-	svc secret.Service
-)
-
-func init() {
-	test.DevelopmentSetUp()
-	svc = secret.GetService()
-}

devcloud/cmdb/apps/secret/impl/secret.go

@@ -1,100 +0,0 @@
-package impl
-
-import (
-	"context"
-	"fmt"
-
-	"122.51.31.227/go-course/go18/devcloud/cmdb/apps/secret"
-	"github.com/infraboard/mcube/v2/exception"
-	"github.com/infraboard/mcube/v2/ioc/config/datasource"
-	"github.com/infraboard/mcube/v2/types"
-	"github.com/infraboard/modules/task/apps/task"
-	"gorm.io/gorm"
-)
-
-// CreateSecret implements secret.Service.
-func (s *SecretServiceImpl) CreateSecret(ctx context.Context, in *secret.CreateSecretRequest) (*secret.Secret, error) {
-	ins := secret.NewSecret(in)
-
-	// 需要加密
-	if err := ins.EncryptedApiSecret(); err != nil {
-		return nil, err
-	}
-
-	// upsert, gorm save
-	if err := datasource.DBFromCtx(ctx).Save(ins).Error; err != nil {
-		return nil, err
-	}
-
-	return ins, nil
-}
-
-// DescribeSecret implements secret.Service.
-func (s *SecretServiceImpl) DescribeSecret(ctx context.Context, in *secret.DescribeSecretRequeset) (*secret.Secret, error) {
-	// 取出后，需要解密
-	ins := &secret.Secret{}
-	query := in.GormResourceFilter(datasource.DBFromCtx(ctx).Model(&secret.Secret{}))
-	if err := query.Where("id = ?", in.Id).Take(ins).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, exception.NewNotFound("secret %s not found", in.Id)
-		}
-		return nil, err
-	}
-	ins.SetIsEncrypted(true)
-	if err := ins.DecryptedApiSecret(); err != nil {
-		return nil, err
-	}
-
-	// 解密过后的数据
-	return ins, nil
-}
-
-// QuerySecret implements secret.Service.
-func (s *SecretServiceImpl) QuerySecret(ctx context.Context, in *secret.QuerySecretRequest) (*types.Set[*secret.Secret], error) {
-	set := types.New[*secret.Secret]()
-
-	query := in.GormResourceFilter(datasource.DBFromCtx(ctx).Model(&secret.Secret{}))
-	err := query.Count(&set.Total).Error
-	if err != nil {
-		return nil, err
-	}
-
-	err = query.
-		Order("create_at desc").
-		Offset(int(in.ComputeOffset())).
-		Limit(int(in.PageSize)).
-		Find(&set.Items).
-		Error
-	if err != nil {
-		return nil, err
-	}
-	return set, nil
-
-}
-
-// SyncResource implements secret.Service.
-// 资源同步接口
-func (s *SecretServiceImpl) SyncResource(ctx context.Context, in *secret.SyncResourceRequest) (*types.Set[*task.Task], error) {
-	// 直接初始化并返回，避免警告
-	taskSet := types.NewSet[*task.Task]()
-
-	// 查询Secret信息
-	ins, err := s.DescribeSecret(ctx, secret.NewDescribeSecretRequeset(in.Id))
-	if err != nil {
-		return taskSet, err
-	}
-
-	if !ins.GetEnabled() {
-		return taskSet, fmt.Errorf("secret %s not enabled", ins.Name)
-	}
-
-	// 获取syncer,  执行同步
-	for _, rs := range ins.ResourceType {
-		syncer := secret.GetSyncer(rs)
-		for _, region := range ins.Regions {
-			taskInfo := syncer.Sync(ctx, ins, region, rs)
-			taskSet.Add(taskInfo)
-		}
-	}
-	return taskSet, nil
-}

devcloud/cmdb/apps/secret/impl/secret_test.go

@@ -1,59 +0,0 @@
-package impl_test
-
-import (
-	"os"
-	"testing"
-	"time"
-
-	"122.51.31.227/go-course/go18/devcloud/cmdb/apps/resource"
-	"122.51.31.227/go-course/go18/devcloud/cmdb/apps/secret"
-)
-
-func TestCreateSecret(t *testing.T) {
-	req := secret.NewCreateSecretRequest()
-	req.Name = "腾讯云只读账号"
-	req.Vendor = resource.VENDOR_TENCENT
-	req.ApiKey = os.Getenv("TX_API_KEY")
-	req.ApiSecret = os.Getenv("TX_API_SECRET")
-	req.SetEnabled(true)
-	req.ResourceType = append(req.ResourceType, resource.TYPE_VM)
-	req.Regions = []string{"ap-shanghai", "ap-guangzhou"}
-	ins, err := svc.CreateSecret(t.Context(), req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Log(ins)
-}
-
-func TestQuerySecret(t *testing.T) {
-	req := secret.NewQuerySecretRequest()
-	set, err := svc.QuerySecret(t.Context(), req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Log(set)
-}
-
-const (
-	SECRET_ID = "e5aa1ad4-6069-397e-a7ed-a78b9cd2a93b"
-)
-
-func TestDescribeSecret(t *testing.T) {
-	req := secret.NewDescribeSecretRequeset(SECRET_ID)
-	ins, err := svc.DescribeSecret(t.Context(), req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Log(ins)
-}
-
-func TestSyncResource(t *testing.T) {
-	req := secret.NewSyncResourceRequest(SECRET_ID)
-	ins, err := svc.SyncResource(t.Context(), req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Log(ins)
-
-	time.Sleep(3 * time.Second)
-}

devcloud/cmdb/apps/secret/interface.go

@@ -1,97 +0,0 @@
-package secret
-
-import (
-	"context"
-
-	"122.51.31.227/go-course/go18/devcloud/cmdb/apps/resource"
-	"122.51.31.227/go-course/go18/devcloud/mcenter/apps/policy"
-	"github.com/infraboard/mcube/v2/http/request"
-	"github.com/infraboard/mcube/v2/ioc"
-	"github.com/infraboard/mcube/v2/tools/pretty"
-	"github.com/infraboard/mcube/v2/types"
-	"github.com/infraboard/modules/task/apps/task"
-)
-
-const (
-	APP_NAME   = "secret"
-	SECRET_KEY = "23gs6gxHrz1kNEvshRmunkXbwIiaEcYfh+EMu+e9ewA="
-)
-
-func GetService() Service {
-	return ioc.Controller().Get(APP_NAME).(Service)
-}
-
-type Service interface {
-	// 用于Secret的管理(后台管理员配置)
-	// 创建secret
-	CreateSecret(context.Context, *CreateSecretRequest) (*Secret, error)
-	// 查询secret
-	QuerySecret(context.Context, *QuerySecretRequest) (*types.Set[*Secret], error)
-	// 查询详情, 已解密, API层需要脱敏
-	DescribeSecret(context.Context, *DescribeSecretRequeset) (*Secret, error)
-
-	// 基于云商凭证来同步资源
-	// 怎么API怎么设计
-	// 同步阿里云所有资源, 10分钟，30分钟 ...
-	// 这个接口调用持续30分钟...
-	// 需要拆解为异步任务: 用户调用了同步后, 里面返回, 这个同步任务在后台执行(Gorouties), 需要查询同步日志(Ws)
-
-	// 使用task模块来执行异步任务, 通过TaskId查询异步任务状态
-	SyncResource(context.Context, *SyncResourceRequest) (*types.Set[*task.Task], error)
-}
-
-// 同步记录(task) 有状态
-type SyncResourceTask struct {
-}
-
-type QuerySyncLogRequest struct {
-	TaskId int `json:"task_id"`
-}
-
-// 每个资源的同步日志
-type SyncRecord struct {
-}
-
-type ResourceResponse struct {
-	Success    bool
-	InstanceId string             `json:"instance_id"`
-	Resource   *resource.Resource `json:"resource"`
-	Message    string             `json:"message"`
-}
-
-func (t ResourceResponse) String() string {
-	return pretty.ToJSON(t)
-}
-
-func NewQuerySecretRequest() *QuerySecretRequest {
-	return &QuerySecretRequest{
-		PageRequest: request.NewDefaultPageRequest(),
-	}
-}
-
-type QuerySecretRequest struct {
-	policy.ResourceScope
-	// 分页请求
-	*request.PageRequest
-}
-
-func NewDescribeSecretRequeset(id string) *DescribeSecretRequeset {
-	return &DescribeSecretRequeset{
-		Id: id,
-	}
-}
-
-type DescribeSecretRequeset struct {
-	policy.ResourceScope
-	Id string `json:"id"`
-}
-
-func NewSyncResourceRequest(id string) *SyncResourceRequest {
-	return &SyncResourceRequest{
-		Id: id,
-	}
-}
-
-type SyncResourceRequest struct {
-	Id string `json:"id"`
-}

devcloud/cmdb/apps/secret/model.go

@@ -1,152 +0,0 @@
-package secret
-
-import (
-	"encoding/base64"
-	"fmt"
-
-	"122.51.31.227/go-course/go18/devcloud/cmdb/apps/resource"
-	"122.51.31.227/go-course/go18/devcloud/mcenter/apps/policy"
-	"github.com/google/uuid"
-	"github.com/infraboard/devops/pkg/model"
-	"github.com/infraboard/mcube/v2/crypto/cbc"
-	"github.com/infraboard/mcube/v2/tools/pretty"
-	"github.com/infraboard/mcube/v2/types"
-)
-
-func NewSecretSet() *types.Set[*Secret] {
-	return types.New[*Secret]()
-}
-
-func NewSecret(in *CreateSecretRequest) *Secret {
-	//  hash版本的UUID
-	// 	Vendor Address ApiKey
-	uid := uuid.NewMD5(uuid.Nil, fmt.Appendf(nil, "%s.%s.%s", in.Vendor, in.Address, in.ApiKey)).String()
-	return &Secret{
-		Meta:                *model.NewMeta().SetId(uid),
-		CreateSecretRequest: *in,
-	}
-}
-
-type Secret struct {
-	model.Meta
-	// 资源范围, Namespace是继承的, Scope是API添加的
-	policy.ResourceLabel
-	// 资源定义
-	CreateSecretRequest
-}
-
-func (s *Secret) TableName() string {
-	return "secrets"
-}
-
-func (s *Secret) SetDefault() *Secret {
-	if s.SyncLimit == 0 {
-		s.SyncLimit = 10
-	}
-	return s
-}
-
-func (s *Secret) String() string {
-	return pretty.ToJSON(s)
-}
-
-func NewCreateSecretRequest() *CreateSecretRequest {
-	return &CreateSecretRequest{
-		Regions:   []string{},
-		SyncLimit: 10,
-	}
-}
-
-type CreateSecretRequest struct {
-	// 是否启用
-	Enabled *bool `json:"enabled" gorm:"column:enabled"`
-	// 名称
-	Name string `json:"name" gorm:"column:name"`
-	// 尝试
-	Vendor resource.VENDOR `json:"vendor" gorm:"column:vendor"`
-	// Vmware
-	Address string `json:"address" gorm:"column:address"`
-	// 需要被脱敏
-	// Musk
-	ApiKey string `json:"api_key" gorm:"column:api_key"`
-	// ApiKey
-	ApiSecret string `json:"api_secret" mask:",5,4" gorm:"column:api_secret"`
-	// 资源所在区域
-	Regions []string `json:"regions" gorm:"column:regions;serializer:json;type:json"`
-	// 资源列表
-	ResourceType []resource.TYPE `json:"resource_type" gorm:"column:resource_type;serializer:json;type:json"`
-	// 同步分页大小
-	SyncLimit int64 `json:"sync_limit" gorm:"column:sync_limit"`
-
-	//
-	isEncrypted bool `gorm:"-"`
-}
-
-func (r *CreateSecretRequest) SetIsEncrypted(v bool) *CreateSecretRequest {
-	r.isEncrypted = v
-	return r
-}
-
-func (r *CreateSecretRequest) SetEnabled(v bool) *CreateSecretRequest {
-	r.Enabled = &v
-	return r
-}
-
-func (r *CreateSecretRequest) GetEnabled() bool {
-	if r.Enabled == nil {
-		return false
-	}
-	return *r.Enabled
-}
-
-func (r *CreateSecretRequest) GetSyncLimit() int64 {
-	if r.SyncLimit == 0 {
-		return 10
-	}
-	return r.SyncLimit
-}
-
-func (r *CreateSecretRequest) EncryptedApiSecret() error {
-	if r.isEncrypted {
-		return nil
-	}
-	// Hash, 对称，非对称
-	// 对称加密 AES(cbc)
-	// @v1,xxxx@xxxxx
-
-	key, err := base64.StdEncoding.DecodeString(SECRET_KEY)
-	if err != nil {
-		return err
-	}
-
-	cipherText, err := cbc.MustNewAESCBCCihper(key).Encrypt([]byte(r.ApiSecret))
-	if err != nil {
-		return err
-	}
-	r.ApiSecret = base64.StdEncoding.EncodeToString(cipherText)
-	r.SetIsEncrypted(true)
-	return nil
-
-}
-
-func (r *CreateSecretRequest) DecryptedApiSecret() error {
-	if r.isEncrypted {
-		cipherdText, err := base64.StdEncoding.DecodeString(r.ApiSecret)
-		if err != nil {
-			return err
-		}
-
-		key, err := base64.StdEncoding.DecodeString(SECRET_KEY)
-		if err != nil {
-			return err
-		}
-
-		plainText, err := cbc.MustNewAESCBCCihper(key).Decrypt([]byte(cipherdText))
-		if err != nil {
-			return err
-		}
-		r.ApiSecret = string(plainText)
-		r.SetIsEncrypted(false)
-	}
-	return nil
-}

devcloud/cmdb/apps/secret/sync.go

@@ -1,34 +0,0 @@
-package secret
-
-import (
-	"context"
-	"fmt"
-
-	"122.51.31.227/go-course/go18/devcloud/cmdb/apps/resource"
-	"github.com/infraboard/modules/task/apps/task"
-)
-
-const (
-	SYNCER_PREFIX = "syncer"
-)
-
-var (
-	syncers = map[string]Syncer{}
-)
-
-func GetSyncerName(t resource.TYPE) string {
-	return fmt.Sprintf("%s_%s", SYNCER_PREFIX, t)
-}
-
-func GetSyncer(t resource.TYPE) Syncer {
-	return syncers[fmt.Sprintf("%s_%s", SYNCER_PREFIX, t)]
-}
-
-func RegistrySyncer(t resource.TYPE, s Syncer) {
-	syncers[fmt.Sprintf("%s_%s", SYNCER_PREFIX, t)] = s
-}
-
-type Syncer interface {
-	// 资源同步
-	Sync(ctx context.Context, ins *Secret, region string, rt resource.TYPE) *task.Task
-}

devcloud/cmdb/apps/secret/sync/data/vm.json

@@ -1,59 +0,0 @@
-{
-  "Response": {
-    "InstanceSet": [
-      {
-        "BlueprintId": "lhbp-b46k6f98",
-        "BundleId": "bundle_starter_mc_promo_med2_02",
-        "CPU": 2,
-        "CreatedTime": "2025-03-02T09:54:10Z",
-        "ExpiredTime": "2026-03-02T09:54:10Z",
-        "InitInvocationId": "",
-        "InstanceChargeType": "PREPAID",
-        "InstanceId": "lhins-dxvcse1s",
-        "InstanceName": "Docker CE-MyRb",
-        "InstanceRestrictState": "NORMAL",
-        "InstanceState": "RUNNING",
-        "InternetAccessible": {
-          "InternetChargeType": "TRAFFIC_POSTPAID_BY_HOUR",
-          "InternetMaxBandwidthOut": 4,
-          "PublicIpAssigned": true
-        },
-        "IsolatedTime": null,
-        "LatestOperation": "",
-        "LatestOperationRequestId": "",
-        "LatestOperationStartedTime": "2025-03-02T09:53:37Z",
-        "LatestOperationState": "",
-        "LoginSettings": {
-          "KeyIds": []
-        },
-        "Memory": 2,
-        "OsName": "Ubuntu Server 24.04 LTS 64bit",
-        "Platform": "UBUNTU",
-        "PlatformType": "LINUX_UNIX",
-        "PrivateAddresses": [
-          "10.0.4.9"
-        ],
-        "PublicAddresses": [
-          "122.51.31.227"
-        ],
-        "PublicIpv6Addresses": [],
-        "RenewFlag": "NOTIFY_AND_MANUAL_RENEW",
-        "SupportIpv6Detail": {
-          "Detail": "EFFECTIVE_IMMEDIATELY",
-          "IsSupport": true,
-          "Message": ""
-        },
-        "SystemDisk": {
-          "DiskId": "lhdisk-adyw1bgo",
-          "DiskSize": 50,
-          "DiskType": "CLOUD_SSD"
-        },
-        "Tags": [],
-        "Uuid": "dd452294-6c06-4d4e-ab5f-b5d74404b863",
-        "Zone": "ap-shanghai-2"
-      }
-    ],
-    "RequestId": "9863afd3-47f4-4aa0-9e95-9b61ea3e5573",
-    "TotalCount": 1
-  }
-}

devcloud/cmdb/apps/secret/sync/vm.go

@@ -1,116 +0,0 @@
-package sync
-
-import (
-	"context"
-	"fmt"
-
-	"122.51.31.227/go-course/go18/devcloud/cmdb/apps/resource"
-	"122.51.31.227/go-course/go18/devcloud/cmdb/apps/secret"
-	"github.com/infraboard/mcube/v2/ioc"
-	"github.com/infraboard/mcube/v2/ioc/config/log"
-	"github.com/infraboard/mcube/v2/tools/ptr"
-	"github.com/infraboard/modules/task/apps/event"
-	"github.com/infraboard/modules/task/apps/task"
-	"github.com/rs/zerolog"
-
-	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
-	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
-	lighthouse "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse/v20200324"
-)
-
-func init() {
-	ioc.Controller().Registry(&VmSyncerServiceImpl{})
-}
-
-var _ secret.Syncer = (*VmSyncerServiceImpl)(nil)
-
-type VmSyncerServiceImpl struct {
-	ioc.ObjectImpl
-
-	log *zerolog.Logger
-}
-
-func (s *VmSyncerServiceImpl) Name() string {
-	return secret.GetSyncerName(resource.TYPE_VM)
-}
-
-func (s *VmSyncerServiceImpl) Init() error {
-	s.log = log.Sub(s.Name())
-	secret.RegistrySyncer(resource.TYPE_VM, s)
-	return nil
-}
-
-// Sync implements secret.Syncer.
-func (s *VmSyncerServiceImpl) Sync(ctx context.Context, ins *secret.Secret, region string, rs resource.TYPE) *task.Task {
-	// 怎么使用对应secret 来完成, 用的腾讯的API
-	// https://console.cloud.tencent.com/api/explorer?Product=cvm&Version=2017-03-12&Action=DescribeRegions
-	// https://console.cloud.tencent.com/api/explorer?Product=lighthouse&Version=2020-03-24&Action=DescribeInstances
-	return task.GetService().Run(ctx, task.NewFnTask(func(ctx context.Context, req any) error {
-		taskInfo := task.GetTaskFromCtx(ctx)
-		_, err := event.GetService().AddEvent(ctx, task.NewInfoEvent("同步开始", taskInfo.Id))
-		if err != nil {
-			return err
-		}
-		defer event.GetService().AddEvent(ctx, task.NewInfoEvent("同步结束", taskInfo.Id))
-
-		// 实例化一个认证对象，入参需要传入腾讯云账户 SecretId 和 SecretKey，此处还需注意密钥对的保密
-		// 代码泄露可能会导致 SecretId 和 SecretKey 泄露，并威胁账号下所有资源的安全性
-		// 以下代码示例仅供参考，建议采用更安全的方式来使用密钥
-		// 请参见：https://cloud.tencent.com/document/product/1278/85305
-		// 密钥可前往官网控制台 https://console.cloud.tencent.com/cam/capi 进行获取
-		credential := common.NewCredential(
-			ins.ApiKey,
-			ins.ApiSecret,
-		)
-		// 使用临时密钥示例
-		// credential := common.NewTokenCredential("SecretId", "SecretKey", "Token")
-		// 实例化一个client选项，可选的，没有特殊需求可以跳过
-		cpf := profile.NewClientProfile()
-		cpf.HttpProfile.Endpoint = "lighthouse.tencentcloudapi.com"
-		// 实例化要请求产品的client对象,clientProfile是可选的
-		// "ap-shanghai"
-		client, _ := lighthouse.NewClient(credential, region, cpf)
-
-		// 实例化一个请求对象,每个接口都会对应一个request对象
-		request := lighthouse.NewDescribeInstancesRequest()
-
-		// 返回的resp是一个DescribeInstancesResponse的实例，与请求对象对应
-		response, err := client.DescribeInstances(request)
-		if err != nil {
-			return err
-		}
-
-		_, err = event.GetService().AddEvent(ctx, task.NewInfoEvent("接口调用成功", taskInfo.Id).SetDetail(response.ToJsonString()))
-		if err != nil {
-			return err
-		}
-
-		// 获取出了实例的列表
-		for _, vm := range response.Response.InstanceSet {
-			// 转化为一个Resource对象
-			res := resource.NewResource()
-			res.Vendor = resource.VENDOR_TENCENT
-			res.CredentialId = ins.Id
-			res.Region = region
-			res.ResourceType = resource.TYPE_VM
-			res.Id = ptr.GetValue(vm.InstanceId)
-			res.Name = ptr.GetValue(vm.InstanceName)
-			res.Cpu = ptr.GetValue(vm.CPU)
-			res.Memory = ptr.GetValue(vm.Memory)
-			res.SystemStorage = ptr.GetValue(vm.SystemDisk.DiskSize)
-			res.Extra["os_name"] = ptr.GetValue(vm.OsName)
-			res.PrivateAddress = ptr.GetArrayValue(vm.PrivateAddresses)
-			res.PublicAddress = ptr.GetArrayValue(vm.PublicAddresses)
-			res.Phase = ptr.GetValue(vm.InstanceState)
-			res, err := resource.GetService().Add(ctx, res)
-			if err != nil {
-				return err
-			}
-			_, err = event.GetService().AddEvent(ctx, task.NewInfoEvent(fmt.Sprintf("资源%s同步成功", res.Name), taskInfo.Id).SetDetail(res.String()))
-			if err != nil {
-				return err
-			}
-		}
-		return nil
-	}, ins).SetAsync(true).SetLabel(secret.TASK_LABLE_SECRET_ID, ins.Id))
-}

devcloud/cmdb/design.drawio

@@ -1,68 +0,0 @@
-<mxfile host="65bd71144e">
-    <diagram id="_dFAOaWQpwMIgqf1TTqB" name="第 1 页">
-        <mxGraphModel dx="888" dy="495" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
-            <root>
-                <mxCell id="0"/>
-                <mxCell id="1" parent="0"/>
-                <mxCell id="3" value="&lt;h1 style=&quot;margin-top: 0px;&quot;&gt;基于模型&lt;/h1&gt;&lt;p&gt;这里的模型，数据库里面的一种表&lt;/p&gt;&lt;p&gt;基于关系性数据库，设计 表概念&lt;/p&gt;&lt;p&gt;1. 传统: 数据库里面添加表&lt;/p&gt;&lt;p&gt;2.&amp;nbsp; 通过cmdb提供的API来添加模型&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;" style="text;html=1;whiteSpace=wrap;overflow=hidden;rounded=0;" vertex="1" parent="1">
-                    <mxGeometry x="30" y="70" width="200" height="150" as="geometry"/>
-                </mxCell>
-                <mxCell id="6" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="4" target="5">
-                    <mxGeometry relative="1" as="geometry"/>
-                </mxCell>
-                <mxCell id="7" value="1: N" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="6">
-                    <mxGeometry x="0.0067" y="-2" relative="1" as="geometry">
-                        <mxPoint as="offset"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="4" value="model表&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;模型的名称(ec2)&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="50" y="250" width="310" height="150" as="geometry"/>
-                </mxCell>
-                <mxCell id="10" style="edgeStyle=none;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="5" target="8">
-                    <mxGeometry relative="1" as="geometry"/>
-                </mxCell>
-                <mxCell id="11" value="1: N" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="10">
-                    <mxGeometry x="-0.2893" y="-1" relative="1" as="geometry">
-                        <mxPoint as="offset"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="5" value="model 字段表&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;模型的字段&lt;/div&gt;&lt;div&gt;（name: 名称, ip: 主机的IP)&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="460" y="250" width="310" height="150" as="geometry"/>
-                </mxCell>
-                <mxCell id="8" value="实例表:&lt;div&gt;核心 记录 模型字段对应的数据&lt;/div&gt;&lt;div&gt;name字段编号(1): ec2_01&lt;/div&gt;&lt;div&gt;ip的字段编号(2): 10.10.10.1&amp;nbsp;&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="460" y="510" width="310" height="150" as="geometry"/>
-                </mxCell>
-                <mxCell id="9" value="&lt;div&gt;&lt;br&gt;&lt;/div&gt;ec2实例[] {&lt;div&gt;&lt;font color=&quot;#000000&quot;&gt;name: ec2_01&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;font color=&quot;#000000&quot;&gt;ip: 10.10.10.1&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;font color=&quot;#000000&quot;&gt;&lt;br&gt;&lt;/font&gt;&lt;div&gt;}&lt;/div&gt;&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
-                    <mxGeometry x="60" y="510" width="170" height="90" as="geometry"/>
-                </mxCell>
-                <mxCell id="12" value="&lt;h1 style=&quot;margin-top: 0px;&quot;&gt;基于表的CMDB&lt;/h1&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;沿用关系性数据库的设计逻辑, 已有的数据库工具&lt;/p&gt;&lt;p&gt;1. 提供一组API来让用户录入数控，并且通过API查询数据库&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;" style="text;html=1;whiteSpace=wrap;overflow=hidden;rounded=0;" vertex="1" parent="1">
-                    <mxGeometry x="70" y="690" width="410" height="130" as="geometry"/>
-                </mxCell>
-                <mxCell id="13" value="资源表&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;通用字段,&amp;nbsp; 通过直接添加， 非通用字段, 直接存储为json&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="60" y="870" width="310" height="150" as="geometry"/>
-                </mxCell>
-                <mxCell id="14" value="Resource: CRUD的API" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
-                    <mxGeometry x="60" y="840" width="110" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="15" value="&lt;div&gt;凭证管理&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;存储敏感数据的表(对称加解密)&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="60" y="1110" width="310" height="150" as="geometry"/>
-                </mxCell>
-                <mxCell id="16" value="Secret: CRUD API" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
-                    <mxGeometry x="60" y="1080" width="110" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="17" value="&lt;h1 style=&quot;margin-top: 0px;&quot;&gt;敏感数据&lt;/h1&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot;background-color: transparent;&quot;&gt;1.&amp;nbsp; 存储加密, 访问运维看到数据库&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot;background-color: transparent;&quot;&gt;1.&amp;nbsp; API 提供的数据 需要脱名，这种数据是不允许通过API对外开放的, 只允许进程内使用&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;" style="text;html=1;whiteSpace=wrap;overflow=hidden;rounded=0;" vertex="1" parent="1">
-                    <mxGeometry x="400" y="1100" width="410" height="160" as="geometry"/>
-                </mxCell>
-                <mxCell id="18" value="sync" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="240" y="1220" width="120" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="19" value="secret" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="80" y="1220" width="120" height="30" as="geometry"/>
-                </mxCell>
-                <mxCell id="20" style="edgeStyle=none;html=1;exitX=0.75;exitY=0;exitDx=0;exitDy=0;entryX=0.869;entryY=0.984;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="18" target="13">
-                    <mxGeometry relative="1" as="geometry"/>
-                </mxCell>
-            </root>
-        </mxGraphModel>
-    </diagram>
-</mxfile>

devcloud/cmdb/test/setup.go

@@ -1,21 +0,0 @@
-package test
-
-import (
-	"os"
-
-	"github.com/infraboard/mcube/v2/ioc"
-	// 要注册哪些对象, Book, Comment
-
-	// 加载的业务对象
-	_ "122.51.31.227/go-course/go18/devcloud/cmdb/apps"
-	// task模块
-	_ "github.com/infraboard/modules/task/apps"
-	// _ "122.51.31.227/go-course/go18/devcloud/mcenter/apps"
-	// _ "122.51.31.227/go-course/go18/devcloud/mpaas/apps"
-)
-
-func DevelopmentSetUp() {
-	// import 后自动执行的逻辑
-	// 工具对象的初始化, 需要的是绝对路径
-	ioc.DevelopmentSetupWithPath(os.Getenv("CONFIG_PATH"))
-}

devcloud/etc/application.toml

@@ -12,7 +12,7 @@
   username = "root"
   password = "123456"
   auto_migrate = true
-  debug = false
+  debug = true
 
 [mongo]
   endpoints = ["127.0.0.1:27017"]

devcloud/etc/unit_test.env

@@ -1,3 +0,0 @@
-
-TX_API_KEY=
-TX_API_SECRET=

devcloud/main.go

@@ -5,12 +5,9 @@ import (
 
 	// mcenter 业务对象
 	_ "122.51.31.227/go-course/go18/devcloud/mcenter/apps"
-
 	// audit 业务对象
 	_ "122.51.31.227/go-course/go18/devcloud/audit/apps"
-
 	// mpaas 应用发布
-	_ "122.51.31.227/go-course/go18/devcloud/mpaas/apps"
 
 	// 非功能性模块
 	_ "github.com/infraboard/mcube/v2/ioc/apps/apidoc/restful"

devcloud/mcenter/apps/policy/impl/permission.go

@@ -2,8 +2,8 @@ package impl
 
 import (
 	"context"
-	"fmt"
 
+	"122.51.31.227/go-course/go18/devcloud/mcenter/apps/endpoint"
 	"122.51.31.227/go-course/go18/devcloud/mcenter/apps/namespace"
 	"122.51.31.227/go-course/go18/devcloud/mcenter/apps/policy"
 	"122.51.31.227/go-course/go18/devcloud/mcenter/apps/role"
@@ -36,8 +36,8 @@ func (i *PolicyServiceImpl) QueryNamespace(ctx context.Context, in *policy.Query
 
 // 查询用户可以访问的Api接口
 // 找到用户可以访问的角色列表，然后在找出角色对应的Api访问权限
-func (i *PolicyServiceImpl) QueryEndpoint(ctx context.Context, in *policy.QueryEndpointRequest) (*policy.QueryEndpointResponse, error) {
+func (i *PolicyServiceImpl) QueryEndpoint(ctx context.Context, in *policy.QueryEndpointRequest) (*types.Set[*endpoint.Endpoint], error) {
-	resp := policy.NewQueryEndpointResponse()
+	set := types.New[*endpoint.Endpoint]()
 	policies, err := i.QueryPolicy(ctx,
 		policy.NewQueryPolicyRequest().
 			SetSkipPage(true).
@@ -49,30 +49,19 @@ func (i *PolicyServiceImpl) QueryEndpoint(ctx context.Context, in *policy.QueryE
 		return nil, err
 	}
 
-	// 没有权限
-	if policies.Len() == 0 {
-		return resp, nil
-	}
-
-	if policies.Len() > 1 {
-		return nil, fmt.Errorf("同一个空间下, 一个用户有多条[%d]授权", policies.Len())
-	}
-
-	p := policies.First()
 	roleReq := role.NewQueryMatchedEndpointRequest()
-	roleReq.Add(p.RoleId...)
+	policies.ForEach(func(t *policy.Policy) {
+		roleReq.Add(t.RoleId...)
+	})
 
-	// p.ResourceScope
-	resp.ResourceScope = p.ResourceScope
 	if policies.Len() > 0 {
-		set, err := role.GetService().QueryMatchedEndpoint(ctx, roleReq)
+		set, err = role.GetService().QueryMatchedEndpoint(ctx, roleReq)
 		if err != nil {
 			return nil, err
 		}
-		resp.Items = set.Items
 	}
 
-	return resp, nil
+	return set, nil
 }
 
 // 校验Api接口权限
@@ -80,7 +69,7 @@ func (i *PolicyServiceImpl) ValidateEndpointPermission(ctx context.Context, in *
 	resp := policy.NewValidateEndpointPermissionResponse(*in)
 
 	// 空间Owner有所有权限
-	ns, err := namespace.GetService().DescribeNamespace(ctx, namespace.NewDescribeNamespaceRequest().SetNamespaceId(in.GetNamespaceId()))
+	ns, err := namespace.GetService().DescribeNamespace(ctx, namespace.NewDescribeNamespaceRequest().SetNamespaceId(in.NamespaceId))
 	if err != nil {
 		return nil, err
 	}
@@ -92,20 +81,15 @@ func (i *PolicyServiceImpl) ValidateEndpointPermission(ctx context.Context, in *
 	// 非空间管理员需要独立鉴权, 查询用户可以访问的API列表
 	endpointReq := policy.NewQueryEndpointRequest()
 	endpointReq.UserId = in.UserId
-	endpointReq.NamespaceId = in.GetNamespaceId()
+	endpointReq.NamespaceId = in.NamespaceId
 	endpointSet, err := i.QueryEndpoint(ctx, endpointReq)
 	if err != nil {
 		return nil, err
 	}
-
-	// 补充Api访问的scope
-	resp.ResourceScope = endpointSet.ResourceScope
-
 	for _, item := range endpointSet.Items {
 		if item.IsMatched(in.Service, in.Method, in.Path) {
 			resp.HasPermission = true
 			resp.Endpoint = item
-
 			break
 		}
 	}

devcloud/mcenter/apps/policy/impl/permission_test.go

@@ -8,7 +8,7 @@ import (
 
 func TestQueryNamespace(t *testing.T) {
 	req := policy.NewQueryNamespaceRequest()
-	req.UserId = 2
+	req.UserId = 1
 	set, err := impl.QueryNamespace(ctx, req)
 	if err != nil {
 		t.Fatal(err)
@@ -29,8 +29,8 @@ func TestQueryEndpoint(t *testing.T) {
 
 func TestValidateEndpointPermission(t *testing.T) {
 	req := policy.NewValidateEndpointPermissionRequest()
-	req.UserId = 3
+	req.UserId = 1
-	req.SetNamespaceId(1)
+	req.NamespaceId = 1
 	req.Service = "devcloud"
 	req.Method = "GET"
 	req.Path = "/api/devcloud/v1/users/"

devcloud/mcenter/apps/policy/impl/policy_test.go

@@ -20,14 +20,9 @@ func TestQueryPolicy(t *testing.T) {
 
 func TestCreatePolicy(t *testing.T) {
 	req := policy.NewCreatePolicyRequest()
-	// guest
 	req.UserId = 2
-	// 开发
+	req.RoleId = []uint64{1}
-	req.RoleId = []uint64{3}
-	// default
 	req.SetNamespaceId(1)
-	// 开发小组1的资源
-	req.SetScope("team", []string{"dev01"})
 	set, err := impl.CreatePolicy(ctx, req)
 	if err != nil {
 		t.Fatal(err)

devcloud/mcenter/apps/policy/interface.go

@@ -132,28 +132,17 @@ type PermissionService interface {
 	// 查询用户可以访问的菜单
 	QueryMenu(context.Context, *QueryMenuRequest) (*types.Set[*view.Menu], error)
 	// 查询用户可以访问的Api接口
-	QueryEndpoint(context.Context, *QueryEndpointRequest) (*QueryEndpointResponse, error)
+	QueryEndpoint(context.Context, *QueryEndpointRequest) (*types.Set[*endpoint.Endpoint], error)
 	// 校验页面权限
 	ValidatePagePermission(context.Context, *ValidatePagePermissionRequest) (*ValidatePagePermissionResponse, error)
 	// 校验接口权限
 	ValidateEndpointPermission(context.Context, *ValidateEndpointPermissionRequest) (*ValidateEndpointPermissionResponse, error)
 }
 
-func NewQueryEndpointResponse() *QueryEndpointResponse {
-	return &QueryEndpointResponse{
-		Items: []*endpoint.Endpoint{},
-	}
-}
-
-type QueryEndpointResponse struct {
-	ResourceScope
-	Items []*endpoint.Endpoint
-}
-
 type ValidatePagePermissionRequest struct {
-	UserId uint64 `json:"user_id" form:"user_id"`
+	UserId      uint64 `json:"user_id" form:"user_id"`
-	Path   string `json:"path" form:"path"`
+	NamespaceId uint64 `json:"namespace_id" form:"namespace_id"`
-	ResourceScope
+	Path        string `json:"path" form:"path"`
 }
 
 func NewValidatePagePermissionResponse(req ValidatePagePermissionRequest) *ValidatePagePermissionResponse {
@@ -173,11 +162,11 @@ func NewValidateEndpointPermissionRequest() *ValidateEndpointPermissionRequest {
 }
 
 type ValidateEndpointPermissionRequest struct {
-	UserId  uint64 `json:"user_id" form:"user_id"`
+	UserId      uint64 `json:"user_id" form:"user_id"`
-	Service string `json:"service" form:"service"`
+	NamespaceId uint64 `json:"namespace_id" form:"namespace_id"`
-	Path    string `json:"path" form:"path"`
+	Service     string `json:"service" form:"service"`
-	Method  string `json:"method" form:"method"`
+	Path        string `json:"path" form:"path"`
-	ResourceScope
+	Method      string `json:"method" form:"method"`
 }
 
 func NewValidateEndpointPermissionResponse(req ValidateEndpointPermissionRequest) *ValidateEndpointPermissionResponse {

devcloud/mcenter/apps/policy/model.go

@@ -82,31 +82,6 @@ type ResourceScope struct {
 	Scope map[string][]string `json:"scope" bson:"scope" gorm:"column:scope;serializer:json;type:json" description:"数据访问的范围" optional:"true"`
 }
 
-func (r ResourceScope) String() string {
-	return pretty.ToJSON(r)
-}
-
-func (r *ResourceScope) BuildMySQLPrefixBlob() {
-	for k := range r.Scope {
-		for i := range r.Scope[k] {
-			if !strings.HasSuffix(r.Scope[k][i], "%") {
-				r.Scope[k][i] += "%"
-			}
-		}
-	}
-}
-
-func (r *ResourceScope) SetNamespaceId(v uint64) {
-	r.NamespaceId = &v
-}
-
-func (r *ResourceScope) GetNamespaceId() uint64 {
-	if r.NamespaceId == nil {
-		return 0
-	}
-	return *r.NamespaceId
-}
-
 func (l *ResourceScope) SetScope(key string, value []string) {
 	if l.Scope == nil {
 		l.Scope = map[string][]string{}
@@ -116,7 +91,7 @@ func (l *ResourceScope) SetScope(key string, value []string) {
 
 func (r ResourceScope) GormResourceFilter(query *gorm.DB) *gorm.DB {
 	if r.NamespaceId != nil {
-		query = query.Where("namespace_id = ?", r.NamespaceId)
+		query = query.Where("namespace = ?", r.NamespaceId)
 	}
 
 	for key, values := range r.Scope {
@@ -169,10 +144,6 @@ type ResourceLabel struct {
 	Label map[string]string `json:"label" bson:"label" gorm:"column:label;serializer:json;type:json" description:"数据访问的范围" optional:"true"`
 }
 
-func (l *ResourceLabel) SetNamespaceId(v uint64) {
-	l.NamespaceId = &v
-}
-
 func (l *ResourceLabel) SetLabel(key, value string) {
 	if l.Label == nil {
 		l.Label = map[string]string{}

devcloud/mcenter/apps/role/impl/api_permission_test.go

@@ -8,7 +8,7 @@ import (
 
 func TestQueryApiPermission(t *testing.T) {
 	req := role.NewQueryApiPermissionRequest()
-	req.AddRoleId(3)
+	req.AddRoleId(2)
 	set, err := impl.QueryApiPermission(ctx, req)
 	if err != nil {
 		t.Fatal(err)
@@ -17,11 +17,8 @@ func TestQueryApiPermission(t *testing.T) {
 }
 
 func TestAddApiPermission(t *testing.T) {
-	req := role.NewAddApiPermissionRequest(3)
+	req := role.NewAddApiPermissionRequest(1)
-	req.Add(
+	req.Add(role.NewResourceActionApiPermissionSpec("devcloud", "user", "list"))
-		role.NewResourceActionApiPermissionSpec("devcloud", "user", "list"),
-		// role.NewResourceActionApiPermissionSpec("devcloud", "application", "list"),
-	)
 	set, err := impl.AddApiPermission(ctx, req)
 	if err != nil {
 		t.Fatal(err)
@@ -31,7 +28,7 @@ func TestAddApiPermission(t *testing.T) {
 
 func TestQueryMatchedEndpoint(t *testing.T) {
 	req := role.NewQueryMatchedEndpointRequest()
-	req.Add(3)
+	req.Add(1)
 	set, err := impl.QueryMatchedEndpoint(ctx, req)
 	if err != nil {
 		t.Fatal(err)

devcloud/mcenter/apps/token/impl/token.go

@@ -49,8 +49,8 @@ func (i *TokenServiceImpl) IssueToken(ctx context.Context, in *token.IssueTokenR
 		}
 	}
 
-	if tk.NamespaceId == nil {
+	if tk.NamespaceId == 0 {
-		tk.SetNamespaceId(1)
+		tk.NamespaceId = 1
 	}
 
 	// 保持Token

devcloud/mcenter/apps/token/model.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 	"time"
 
-	"122.51.31.227/go-course/go18/devcloud/mcenter/apps/policy"
 	"github.com/infraboard/mcube/v2/exception"
 	"github.com/infraboard/mcube/v2/tools/pretty"
 )
@@ -57,6 +56,7 @@ func NewToken() *Token {
 		IssueAt:      time.Now(),
 		Status:       NewStatus(),
 		Extras:       map[string]string{},
+		Scope:        map[string]string{},
 	}
 
 	return tk
@@ -77,14 +77,12 @@ type Token struct {
 	UserName string `json:"user_name" gorm:"column:user_name;type:varchar(100);not null;index" description:"持有该Token的用户名称"`
 	// 是不是管理员
 	IsAdmin bool `json:"is_admin" gorm:"column:is_admin;type:tinyint(1)" description:"是不是管理员"`
-
+	// 令牌生效空间Id
-	// 令牌生效空间Ids
+	NamespaceId uint64 `json:"namespace_id" gorm:"column:namespace_id;type:uint;index" description:"令牌所属空间Id"`
-	policy.ResourceScope
-	// NamespaceId uint64 `json:"namespace_id" gorm:"column:namespace_id;type:uint;index" description:"令牌所属空间Id"`
 	// 令牌生效空间名称
 	NamespaceName string `json:"namespace_name" gorm:"column:namespace_name;type:varchar(100);index" description:"令牌所属空间"`
-	// // 访问范围定义, 鉴权完成后补充
+	// 访问范围定义, 鉴权完成后补充
-	// Scope map[string][]string `json:"scope" gorm:"column:scope;type:varchar(100);serializer:json" description:"令牌访问范围定义"`
+	Scope map[string]string `json:"scope" gorm:"column:scope;type:varchar(100);serializer:json" description:"令牌访问范围定义"`
 	// 颁发给用户的访问令牌(用户需要携带Token来访问接口)
 	AccessToken string `json:"access_token" gorm:"column:access_token;type:varchar(100);not null;uniqueIndex" description:"访问令牌"`
 	// 访问令牌过期时间
@@ -107,10 +105,6 @@ func (t *Token) TableName() string {
 	return "tokens"
 }
 
-func (r *Token) String() string {
-	return pretty.ToJSON(r)
-}
-
 // 判断访问令牌是否过期,没设置代表用不过期
 func (t *Token) IsAccessTokenExpired() error {
 	if t.AccessTokenExpiredAt != nil {
@@ -164,6 +158,10 @@ func (t *Token) SetRefreshTokenExpiredAt(v time.Time) {
 	t.RefreshTokenExpiredAt = &v
 }
 
+func (t *Token) String() string {
+	return pretty.ToJSON(t)
+}
+
 func (t *Token) SetIssuer(issuer string) *Token {
 	t.Issuer = issuer
 	return t

devcloud/mcenter/permission/checker.go

@@ -92,14 +92,6 @@ func (c *Checker) Check(r *restful.Request, w *restful.Response, next *restful.F
 			response.Failed(w, err)
 			return
 		}
-
-		// 如果校验成功，需要把 用户的身份信息，放到请求的上下文中，方便后面的逻辑获取
-		// context.WithValue 来往ctx 添加 value
-		// key: value, value token对象
-		ctx := context.WithValue(r.Request.Context(), token.CTX_TOKEN_KEY, tk)
-
-		// ctx 生成一个新的，继续往下传递
-		r.Request = r.Request.WithContext(ctx)
 	}
 
 	// 请求处理
@@ -119,6 +111,13 @@ func (c *Checker) CheckToken(r *restful.Request) (*token.Token, error) {
 		return nil, err
 	}
 
+	// 如果校验成功，需要把 用户的身份信息，放到请求的上下文中，方便后面的逻辑获取
+	// context.WithValue 来往ctx 添加 value
+	// key: value, value token对象
+	ctx := context.WithValue(r.Request.Context(), token.CTX_TOKEN_KEY, tk)
+
+	// ctx 生成一个新的，继续往下传递
+	r.Request = r.Request.WithContext(ctx)
 	return tk, nil
 }
 
@@ -132,7 +131,7 @@ func (c *Checker) CheckPolicy(r *restful.Request, tk *token.Token, route *endpoi
 	if route.HasRequiredRole() {
 		set, err := c.policy.QueryPolicy(r.Request.Context(),
 			policy.NewQueryPolicyRequest().
-				SetNamespaceId(tk.GetNamespaceId()).
+				SetNamespaceId(tk.NamespaceId).
 				SetUserId(tk.UserId).
 				SetExpired(false).
 				SetEnabled(true).
@@ -146,9 +145,6 @@ func (c *Checker) CheckPolicy(r *restful.Request, tk *token.Token, route *endpoi
 			p := set.Items[i]
 			if route.IsRequireRole(p.Role.Name) {
 				hasPerm = true
-
-				// 把这个scope传递下去
-				tk.Scope = p.Scope
 				break
 			}
 		}
@@ -161,7 +157,7 @@ func (c *Checker) CheckPolicy(r *restful.Request, tk *token.Token, route *endpoi
 	if route.RequiredPerm {
 		validateReq := policy.NewValidateEndpointPermissionRequest()
 		validateReq.UserId = tk.UserId
-		validateReq.ResourceScope = tk.ResourceScope
+		validateReq.NamespaceId = tk.NamespaceId
 		validateReq.Service = application.Get().GetAppName()
 		validateReq.Method = route.Method
 		validateReq.Path = route.Path
@@ -172,9 +168,6 @@ func (c *Checker) CheckPolicy(r *restful.Request, tk *token.Token, route *endpoi
 		if !resp.HasPermission {
 			return exception.NewPermissionDeny("无权限访问")
 		}
-
-		tk.ResourceScope = resp.ResourceScope
-		tk.BuildMySQLPrefixBlob()
 	}
 
 	return nil

devcloud/mpaas/apps/application/api/api.go

@@ -1,58 +0,0 @@
-package api
-
-import (
-	"122.51.31.227/go-course/go18/devcloud/audit/audit"
-	"122.51.31.227/go-course/go18/devcloud/mcenter/permission"
-	"122.51.31.227/go-course/go18/devcloud/mpaas/apps/application"
-	"github.com/infraboard/mcube/v2/ioc"
-	"github.com/infraboard/mcube/v2/ioc/config/gorestful"
-
-	restfulspec "github.com/emicklei/go-restful-openapi/v2"
-	"github.com/emicklei/go-restful/v3"
-)
-
-func init() {
-	ioc.Api().Registry(&UserRestfulApiHandler{})
-}
-
-type UserRestfulApiHandler struct {
-	ioc.ObjectImpl
-
-	// 依赖控制器
-	svc application.Service
-}
-
-func (h *UserRestfulApiHandler) Name() string {
-	return "applications"
-}
-
-func (h *UserRestfulApiHandler) Init() error {
-	h.svc = application.GetService()
-
-	tags := []string{"应用管理"}
-	ws := gorestful.ObjectRouter(h)
-	// required_auth=true/false
-	ws.Route(ws.GET("").To(h.QueryApplication).
-		Doc("应用列表查询").
-		Metadata(restfulspec.KeyOpenAPITags, tags).
-		// 这个开关怎么生效
-		// 中间件需求读取接口的描述信息，来决定是否需要认证
-		Metadata(permission.Auth(true)).
-		Metadata(permission.Permission(true)).
-		Metadata(permission.Resource("application")).
-		Metadata(permission.Action("list")).
-		Metadata(audit.Enable(true)).
-		Param(restful.QueryParameter("page_size", "分页大小").DataType("integer")).
-		Param(restful.QueryParameter("page_number", "页码").DataType("integer")).
-		Writes(Set{}).
-		Returns(200, "OK", Set{}))
-
-	return nil
-}
-
-// *types.Set[*User]
-// 返回的泛型, API Doc这个工具 不支持泛型
-type Set struct {
-	Total int64                     `json:"total"`
-	Items []application.Application `json:"items"`
-}

devcloud/mpaas/apps/application/api/application.go

@@ -1,33 +0,0 @@
-package api
-
-import (
-	"122.51.31.227/go-course/go18/devcloud/mcenter/apps/token"
-	"122.51.31.227/go-course/go18/devcloud/mpaas/apps/application"
-	"github.com/emicklei/go-restful/v3"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/infraboard/mcube/v2/http/restful/response"
-	"github.com/infraboard/mcube/v2/ioc/config/log"
-)
-
-func (h *UserRestfulApiHandler) QueryApplication(r *restful.Request, w *restful.Response) {
-	req := application.NewQueryApplicationRequest()
-
-	// 过滤条件在认证完成后的上下文中
-	tk := token.GetTokenFromCtx(r.Request.Context())
-	req.ResourceScope = tk.ResourceScope
-	log.L().Debug().Msgf("resource scope: %s", tk.ResourceScope)
-
-	// 用户的参数
-	if err := binding.Query.Bind(r.Request, &req.QueryApplicationRequestSpec); err != nil {
-		response.Failed(w, err)
-		return
-	}
-
-	set, err := h.svc.QueryApplication(r.Request.Context(), req)
-	if err != nil {
-		response.Failed(w, err)
-		return
-	}
-
-	response.Success(w, set)
-}

devcloud/mpaas/apps/application/impl/application.go

@@ -29,7 +29,6 @@ func (i *ApplicationServiceImpl) CreateApplication(ctx context.Context, in *appl
 func (i *ApplicationServiceImpl) QueryApplication(ctx context.Context, in *application.QueryApplicationRequest) (*types.Set[*application.Application], error) {
 	set := types.New[*application.Application]()
 
-	i.log.Debug().Msgf("scope: %s", in.ResourceScope)
 	query := in.GormResourceFilter(datasource.DBFromCtx(ctx).Model(&application.Application{}))
 	if in.Id != "" {
 		query = query.Where("id = ?", in.Id)

devcloud/mpaas/apps/application/impl/application_test.go

@@ -12,10 +12,9 @@ func TestCreateApplication(t *testing.T) {
 	req.Description = "应用研发云"
 	req.Type = application.TYPE_SOURCE_CODE
 	req.CodeRepository = application.CodeRepository{
-		SshUrl: "git@122.51.31.227:go-course/go17.git",
+		SshUrl: "git@122.51.31.227:go-course/go18.git",
 	}
-	req.SetNamespaceId(1)
+	req.SetLabel("team", "dev01.web_developer")
-	req.SetLabel("team", "dev01.backend_developer")
 	ins, err := svc.CreateApplication(ctx, req)
 	if err != nil {
 		t.Fatal(err)
@@ -27,8 +26,7 @@ func TestCreateApplication(t *testing.T) {
 func TestQueryApplication(t *testing.T) {
 	req := application.NewQueryApplicationRequest()
 	// dev01.%
-	req.SetNamespaceId(1)
+	req.SetScope("team", []string{"%"})
-	req.SetScope("team", []string{"dev01%"})
 	// req.SetScope("env", []string{"prod"})
 	ins, err := svc.QueryApplication(ctx, req)
 	if err != nil {

devcloud/mpaas/apps/application/impl/impl.go

@@ -4,8 +4,6 @@ import (
 	"122.51.31.227/go-course/go18/devcloud/mpaas/apps/application"
 	"github.com/infraboard/mcube/v2/ioc"
 	"github.com/infraboard/mcube/v2/ioc/config/datasource"
-	"github.com/infraboard/mcube/v2/ioc/config/log"
-	"github.com/rs/zerolog"
 )
 
 func init() {
@@ -16,13 +14,9 @@ var _ application.Service = (*ApplicationServiceImpl)(nil)
 
 type ApplicationServiceImpl struct {
 	ioc.ObjectImpl
-
-	log *zerolog.Logger
 }
 
 func (i *ApplicationServiceImpl) Init() error {
-	i.log = log.Sub(i.Name())
-
 	if datasource.Get().AutoMigrate {
 		err := datasource.DB().AutoMigrate(&application.Application{})
 		if err != nil {

devcloud/mpaas/apps/registry.go

@@ -1,6 +1,5 @@
 package apps
 
 import (
-	_ "122.51.31.227/go-course/go18/devcloud/mpaas/apps/application/api"
 	_ "122.51.31.227/go-course/go18/devcloud/mpaas/apps/application/impl"
 )

devcloud/mpaas/test/set_up.go

@@ -7,7 +7,6 @@ import (
 	// 要注册哪些对象, Book, Comment
 
 	// 加载的业务对象
-	_ "122.51.31.227/go-course/go18/devcloud/mcenter/apps"
 	_ "122.51.31.227/go-course/go18/devcloud/mpaas/apps"
 )
 

go.mod

@@ -8,15 +8,12 @@ require (
 	github.com/emicklei/go-restful/v3 v3.12.2
 	github.com/gin-gonic/gin v1.10.0
 	github.com/google/uuid v1.6.0
-	github.com/infraboard/devops v0.0.6
+	github.com/infraboard/mcube/v2 v2.0.61
-	github.com/infraboard/mcube/v2 v2.0.63
+	github.com/infraboard/modules v0.0.12
-	github.com/infraboard/modules v0.0.20
 	github.com/rs/xid v1.6.0
 	github.com/rs/zerolog v1.34.0
 	github.com/segmentio/kafka-go v0.4.47
 	github.com/stretchr/testify v1.10.0
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1138
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.1134
 	go.mongodb.org/mongo-driver v1.17.3
 	golang.org/x/crypto v0.38.0
 	gopkg.in/yaml.v3 v3.0.1
@@ -34,7 +31,7 @@ require (
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cloudwego/base64x v0.1.5 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
 	github.com/gin-contrib/sse v1.0.0 // indirect
@@ -82,7 +79,6 @@ require (
 	github.com/prometheus/common v0.63.0 // indirect
 	github.com/prometheus/procfs v0.16.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/spf13/cobra v1.9.1 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
@@ -120,6 +116,5 @@ require (
 	modernc.org/mathutil v1.5.0 // indirect
 	modernc.org/memory v1.5.0 // indirect
 	modernc.org/sqlite v1.23.1 // indirect
-	resty.dev/v3 v3.0.0-beta.2 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )

go.sum

@@ -22,9 +22,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/emicklei/go-restful-openapi/v2 v2.11.0 h1:Ur+yGxoOH/7KRmcj/UoMFqC3VeNc9VOe+/XidumxTvk=
@@ -95,12 +94,10 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 h1:e9Rjr40Z98/clHv5Yg79Is0Ntos
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1/go.mod h1:tIxuGz/9mpox++sgp9fJjHO0+q1X9/UOWd798aAm22M=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/infraboard/devops v0.0.6 h1:oo7RfRBxu9hbI/+bYzXuX40BfG1hRyVtxC0fBhoFGBU=
+github.com/infraboard/mcube/v2 v2.0.61 h1:al8Z+poXXOjfTIAY48ujFzV1uYzH/N7/xmve/ZXArbo=
-github.com/infraboard/devops v0.0.6/go.mod h1:Ac+W3wFy5pG9EH7f1W8DxiAZRhnTDFHrp27WKkYnNoU=
+github.com/infraboard/mcube/v2 v2.0.61/go.mod h1:TbYs8cnD8Cg19sTdU0D+vqWAN+LzoxhMYWmAC2pfJkQ=
-github.com/infraboard/mcube/v2 v2.0.63 h1:OUmDajfLAQ1LUVEutCSRbDIQItyLSPHYWXUJLO6IbaE=
+github.com/infraboard/modules v0.0.12 h1:vQqm+JwzmhL+hcD9SV+WVlp9ecInc7NsbGahcTmJ0Wk=
-github.com/infraboard/mcube/v2 v2.0.63/go.mod h1:TbYs8cnD8Cg19sTdU0D+vqWAN+LzoxhMYWmAC2pfJkQ=
+github.com/infraboard/modules v0.0.12/go.mod h1:NdgdH/NoeqibJmFPn9th+tisMuR862/crbXeH4FPMaU=
-github.com/infraboard/modules v0.0.20 h1:5tNT9eSkTBCx4OA+7sZr1Bf+miOGf9Zft2X/sESrlpE=
-github.com/infraboard/modules v0.0.20/go.mod h1:H2kRn3Ksp+3OMt9yYB2imNR2RJgSytTVt9WFP8XpDRQ=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 h1:L0QtFUgDarD7Fpv9jeVMgy/+Ec0mtnmYuImjTz6dtDA=
@@ -181,8 +178,6 @@ github.com/prometheus/procfs v0.16.0/go.mod h1:8veyXUu3nGP7oaCxhX6yeaM5u4stL2FeM
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
-github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
@@ -209,11 +204,6 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1134/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
-github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1138 h1:eMVp9kzjBptP3K0xaUUS68dF5nNTFLbom3uQREaqftM=
-github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1138/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
-github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.1134 h1:+pjecViStkJrHVbZs+OtCFULfAoD0UOxAZJVDwBjKC8=
-github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.1134/go.mod h1:vp2EZhERa7VxNFUlntLv7JDu3OD/pbpUpduFf5BGSfQ=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
@@ -360,7 +350,5 @@ modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
 modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM=
 modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk=
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
-resty.dev/v3 v3.0.0-beta.2 h1:xu4mGAdbCLuc3kbk7eddWfWm4JfhwDtdapwss5nCjnQ=
-resty.dev/v3 v3.0.0-beta.2/go.mod h1:OgkqiPvTDtOuV4MGZuUDhwOpkY8enjOsjjMzeOHefy4=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

skills/html/README.md

@@ -1,3 +0,0 @@
-# HTML
-
-vscode 插件: open in browser

skills/html/index.css

@@ -1,39 +0,0 @@
-/* p {
-  color: blue;
-} */
-
-/* . class */
-.red {
-  color: red;
-}
-
-/* # 表示这是一个id选择器 */
-#input01 {
-    width: 400px;
-}
-
-/* ul>li:first-child {
-  font-weight: 600;
-} */
-
-
-ul li:hover {
-  color: red;  
-  font-size: 20px;
-  font-weight: 600;
-}
-
-img {
-  width: 220px;
-  height: 220px;
-  object-fit: cover;  /* 裁剪成正方形 */
-  border-radius: 4px; /* 可选：圆角 */
-  margin: 10px;
-}
-
-.img-warppter {
-    height: 300px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}

skills/html/index.html

@@ -1,109 +0,0 @@
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Document</title>
-    <link rel="stylesheet" type="text/css" href="./index.css" />
-    <!-- <style>
-        p {
-            color: blue;
-        }
-    </style> -->
-  </head>
-  <body>
-    <h1 id="title01">HTML 语法介绍</h1>
-    <p class="red">段落</p>
-    <p>段落</p>
-    <span class="red">文字A</span>
-    <br />
-    <span class="red">文字B</span>
-    <br />
-    <form action="demo_form.php" method="get">
-      First name: <input id="input01" type="text" name="fname" /><br />
-      Last name: <input type="text" name="lname" /><br />
-      <input type="submit" value="提交" />
-    </form>
-
-    <iframe
-      src="https://www.baidu.com"
-      style="width: 800px; height: 400"
-    ></iframe>
-
-    <table border="1">
-      <tr>
-        <th>Month</th>
-        <th>Savings</th>
-      </tr>
-      <tr>
-        <td>January</td>
-        <td>$100</td>
-      </tr>
-      <tr>
-        <td>February</td>
-        <td>$80</td>
-      </tr>
-    </table>
-
-    <div style="width: 400px; height: 400; background-color: aqua">
-      <table border="1">
-        <tr>
-          <th>Month</th>
-          <th>Savings</th>
-        </tr>
-        <tr>
-          <td>January</td>
-          <td>$100</td>
-        </tr>
-        <tr>
-          <td>February</td>
-          <td>$80</td>
-        </tr>
-      </table>
-      <br />
-      <p>这是一个段落</p>
-    </div>
-    <hr />
-    <div style="width: 400px; height: 400; background-color: aqua">
-      <table border="1">
-        <tr>
-          <th>Month</th>
-          <th>Savings</th>
-        </tr>
-        <tr>
-          <td>January</td>
-          <td>$100</td>
-        </tr>
-        <tr>
-          <td>February</td>
-          <td>$80</td>
-        </tr>
-      </table>
-      <br />
-      <p>这是一个段落</p>
-    </div>
-
-    <span>span1</span>
-    <span>span2</span>
-
-    <br />
-    <ul id="list_menu" class="ul_class">
-      <li id="coffee">Coffee</li>
-      <li>Tea</li>
-      <li>Milk</li>
-      <div>
-        <li>绿茶</li>
-        <li>红茶</li>
-      </div>
-    </ul>
-
-    <div class="img-warppter">
-      <img src="./images/1.jpeg"  alt="" />
-      <img src="./images/2.jpeg" alt="" />
-      <img src="./images/1.jpeg" alt="" />
-    </div>
-
-    <script>
-      document.getElementById("title01").style.color = "red";
-    </script>
-  </body>
-</html>

skills/javascript/README.md

@@ -1,5 +0,0 @@
-# js
-
-[课件](https://gitee.com/infraboard/go-course/blob/master/day19/javascript.md)
-
-安装Code Runner插件

skills/javascript/app.mjs

@@ -1,16 +0,0 @@
-// 唯一的全局变量MYAPP:
-var MYAPP = {};
-
-// 其他变量:
-MYAPP.name = 'myapp';
-MYAPP.version = 1.0;
-
-// 其他函数:
-MYAPP.foo = function () {
-    return 'foo';
-};
-
-// export {MYAPP}
-
-// MYAPP --> default
-export default MYAPP

skills/javascript/async.drawio

@@ -1,57 +0,0 @@
-<mxfile host="65bd71144e">
-    <diagram id="0WS3t2Fnvb50-m555Ywn" name="第 1 页">
-        <mxGraphModel dx="1176" dy="389" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
-            <root>
-                <mxCell id="0"/>
-                <mxCell id="1" parent="0"/>
-                <mxCell id="2" value="事件触发器" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="180" y="70" width="40" height="410" as="geometry"/>
-                </mxCell>
-                <mxCell id="3" value="fna" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="240" y="90" width="120" height="50" as="geometry"/>
-                </mxCell>
-                <mxCell id="4" value="fnb" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="360" y="120" width="120" height="50" as="geometry"/>
-                </mxCell>
-                <mxCell id="5" value="fnc" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="480" y="140" width="120" height="50" as="geometry"/>
-                </mxCell>
-                <mxCell id="6" value="fnd" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="600" y="160" width="120" height="50" as="geometry"/>
-                </mxCell>
-                <mxCell id="7" value="async fna" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="280" y="270" width="120" height="50" as="geometry"/>
-                </mxCell>
-                <mxCell id="8" value="async fnb" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="280" y="350" width="120" height="50" as="geometry"/>
-                </mxCell>
-                <mxCell id="9" value="async fnc" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="280" y="430" width="120" height="50" as="geometry"/>
-                </mxCell>
-                <mxCell id="10" value="async fnd" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="280" y="510" width="120" height="50" as="geometry"/>
-                </mxCell>
-                <mxCell id="13" style="edgeStyle=none;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="11" target="7">
-                    <mxGeometry relative="1" as="geometry"/>
-                </mxCell>
-                <mxCell id="16" value="await" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="13">
-                    <mxGeometry x="0.3011" y="1" relative="1" as="geometry">
-                        <mxPoint as="offset"/>
-                    </mxGeometry>
-                </mxCell>
-                <mxCell id="15" style="edgeStyle=none;html=1;exitX=0;exitY=0.75;exitDx=0;exitDy=0;entryX=1;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="11" target="8">
-                    <mxGeometry relative="1" as="geometry"/>
-                </mxCell>
-                <mxCell id="11" value="excutor(&lt;div&gt;aysnc executor&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;event pool)&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-                    <mxGeometry x="591" y="270" width="120" height="290" as="geometry"/>
-                </mxCell>
-                <mxCell id="12" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.017;entryY=0.31;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="7" target="11">
-                    <mxGeometry relative="1" as="geometry"/>
-                </mxCell>
-                <mxCell id="14" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=-0.025;entryY=0.652;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="8" target="11">
-                    <mxGeometry relative="1" as="geometry"/>
-                </mxCell>
-            </root>
-        </mxGraphModel>
-    </diagram>
-</mxfile>

skills/javascript/promise.js

@@ -1,69 +0,0 @@
-function testApiCall(success, failed) {
-    var timeOut = Math.random() * 2;
-    console.log('set timeout to: ' + timeOut + ' seconds.');
-    setTimeout(function () {
-        if (timeOut < 1) {
-            console.log('call resolve()...');
-            success('200 OK');
-        }
-        else {
-            console.log('call reject()...');
-            failed('timeout in ' + timeOut + ' seconds.');
-        }
-    }, timeOut * 1000);
-}
-
-// 通过回调实现的异步方案
-// fna()
-// fnb()
-// fnc()
-console.log('start ...')
-testApiCall(
-    // success callback
-    (data) => {
-        console.log(data)
-    },
-    // failed callback
-    (error) => {
-        console.log(error)
-    }
-)
-console.log('end ...')
-
-// fna(fnb_sucess(fnc_success(fnd_success)), fnb_error(fnc_error(fnd_error)))
-
-// promise 封装技术, 他让异步成为一种标准, 使用promise的标准方式来处理异常
-// promise 像一个接口，他约束了 excutor对象的 实现方式
-var p1 = new Promise(testApiCall)
-// p1.then((data) => {
-//     console.log(data)
-//     //  p2.then().catch().finally()
-// }).catch((error) => {
-//     console.log(error)
-// }).finally(() => {
-//     console.log('finnal')
-// })
-
-
-// 异步等待
-// 以同步编程的方式，来实现异步代码
-var async_await = async () => {
-    try {
-        const resp = await p1
-        console.log(resp)
-
-        // const res2 = await p2
-        // console.log(resp2)
-
-        // const res3 = await p3
-        // console.log(resp2)
-    } catch (error) {
-        console.log(error)
-    }
-}
-
-async_await()
-
-
-
-

skills/javascript/test.js

@@ -1,84 +0,0 @@
-// function sum (x , y) {
-//     return x + y
-// }
-
-// console.log(sum(1, 10)) 
-
-// var person = {name: '小明', age: 23}
-
-// console.log(person)
-
-// person.greet = function() {
-//     console.log(`hello, my name is ${this.name}, age ${this.age}`)
-// }
-// person.greet()
-
-
-// var name = '李四'
-// var age = 23
-
-// function greet () {
-//     console.log(`hello, my name is ${name}, age ${age}`)
-// }
-
-// greet()
-
-
-// fn = function (x , y) {
-//     return x + y
-// }
-// console.log(fn(1,2)) 
-
-
-// fn = (x, y) => {
-//     return x + y
-// }
-// console.log(fn(1,2)) 
-
-// fn = (x, y) => { return x + y}
-// console.log(fn(1,2)) 
-
-// fn = (x, y) => x + y
-// console.log(fn(1,2)) 
-
-// pow = x => x * x
-
-// console.log(pow(100))
-
-// pkg
-import {firstName, sum as my_sum} from './tool.mjs'
-console.log(my_sum(1,10)) 
-console.log(firstName)
-
-// pkg.
-// import { MYAPP } from './app.mjs'
-// console.log(MYAPP.version)
-
-
-
-// pkg 
-// import { default as MYAPP } from './app.mjs'
-import appPKg from './app.mjs'
-console.log(appPKg.name) 
-
-// for item := rang a {}
-var a = ['A', 'B', 'C'];
-for (var item of a) {
-    // fn(item)
-    console.log(item)
-}
-
-// for k,v := range o {}
-var o = {
-    name: 'Jack',
-    age: 20,
-    city: 'Beijing'
-};
-for (var item of Object.keys(o)) {
-    console.log(item, o[item])
-}
-
-// forEach
-a.forEach((item) => {
-    console.log(item)
-})

skills/javascript/tool.mjs

@@ -1,10 +0,0 @@
-// export var sum = (x, y) => {return x + y}
-export function sum(x, y) {
-    return x + y
-}
-
-var firstName = 'Michael';
-var lastName = 'Jackson';
-var year = 1958;
-
-export {firstName, lastName, year}

skills/kafka/kafka_test.go

@@ -116,7 +116,7 @@ func TestReadMessage(t *testing.T) {
 		GroupID: "devcloud-go18-audit",
 		// 可以指定Partition消费消息
 		// Partition: 0,
-		Topic:    "task_run_events",
+		Topic:    "audit_go18",
 		MinBytes: 10e3, // 10KB
 		MaxBytes: 10e6, // 10MB
 	})