feat(env): add tag support for environment variables and task injection

- Add generic DataRelation and DataStorage models for tags
- Update EnvService and EnvController to support tag assignment, querying, and filtering
- Integrate EnvTagsConfig in Env settings for managing environment tags
- Enhance TaskDialog environment selection to support searching and displaying env tags
- Fix missing TaskLangConfig import in RepoDialog
This commit is contained in:
duorameng
2026-06-08 17:39:24 +08:00
parent e59761fd87
commit 7f7d109438
14 changed files with 316 additions and 26 deletions
+30 -1
View File
@@ -48,6 +48,7 @@ func (ec *EnvController) CreateEnvVar(c *gin.Context) {
Type string `json:"type"`
Hidden *bool `json:"hidden"`
Enabled *bool `json:"enabled"`
Tags string `json:"tags"`
}
if err := c.ShouldBindJSON(&req); err != nil {
@@ -70,6 +71,10 @@ func (ec *EnvController) CreateEnvVar(c *gin.Context) {
}
envVar := ec.envService.CreateEnvVar(req.Name, req.Value, req.Remark, req.Type, hidden, enabled, userID)
if envVar != nil {
ec.envService.SaveEnvTags(envVar.ID, req.Tags)
envVar.Tags = req.Tags
}
utils.Success(c, vo.ToEnvVO(envVar))
}
@@ -84,6 +89,7 @@ func (ec *EnvController) CreateEnvVar(c *gin.Context) {
// @Param page query int false "页码"
// @Param page_size query int false "每页数量"
// @Param type query string false "按类型筛选"
// @Param tags query string false "按标签筛选"
// @Success 200 {object} utils.Response{data=utils.PaginationData{data=[]vo.EnvVO}}
// @Router /env [get]
func (ec *EnvController) GetEnvVars(c *gin.Context) {
@@ -91,7 +97,8 @@ func (ec *EnvController) GetEnvVars(c *gin.Context) {
p := utils.ParsePagination(c)
name := c.DefaultQuery("name", "")
envType := c.DefaultQuery("type", "")
envVars, total := ec.envService.GetEnvVarsWithPagination(userID, name, envType, p.Page, p.PageSize)
tags := c.DefaultQuery("tags", "")
envVars, total := ec.envService.GetEnvVarsWithPagination(userID, name, envType, tags, p.Page, p.PageSize)
utils.PaginatedResponse(c, vo.ToEnvVOListFromModels(envVars), total, p)
}
@@ -163,6 +170,7 @@ func (ec *EnvController) UpdateEnvVar(c *gin.Context) {
Type string `json:"type"`
Hidden *bool `json:"hidden"`
Enabled *bool `json:"enabled"`
Tags string `json:"tags"`
}
if err := c.ShouldBindJSON(&req); err != nil {
@@ -197,6 +205,9 @@ func (ec *EnvController) UpdateEnvVar(c *gin.Context) {
return
}
ec.envService.SaveEnvTags(envVar.ID, req.Tags)
envVar.Tags = req.Tags
utils.Success(c, vo.ToEnvVO(envVar))
}
@@ -259,3 +270,21 @@ func (ec *EnvController) GetAssociatedTasks(c *gin.Context) {
tasks := ec.envService.GetAssociatedTasks(id)
utils.Success(c, vo.ToTaskVOListFromModels(tasks))
}
// GetTags 获取所有环境变量标签
// @Summary 获取所有环境变量标签
// @Description 获取所有环境变量中使用的标签列表
// @Tags 环境变量
// @Accept json
// @Produce json
// @Security BearerAuth
// @Success 200 {object} utils.Response{data=[]string}
// @Router /env/tags [get]
func (ec *EnvController) GetTags(c *gin.Context) {
tags, err := ec.envService.GetAllEnvTags()
if err != nil {
utils.ServerError(c, "获取标签失败")
return
}
utils.Success(c, tags)
}
+2
View File
@@ -26,6 +26,8 @@ var allModels = []interface{}{
&models.Language{},
&models.NotifyWay{},
&models.NotifyBinding{},
&models.DataRelation{},
&models.DataStorage{},
}
func Migrate() error {
+33
View File
@@ -0,0 +1,33 @@
package models
import (
"github.com/engigu/baihu-panel/internal/constant"
)
// DataRelation 通用数据关联表
type DataRelation struct {
ID string `json:"id" gorm:"primaryKey;size:20"`
DataID string `json:"data_id" gorm:"size:20;index;not null"`
RelateID string `json:"relate_id" gorm:"size:20;index;not null"`
Type string `json:"type" gorm:"size:50;index;not null"`
CreatedAt LocalTime `json:"created_at"`
UpdatedAt LocalTime `json:"updated_at"`
}
func (DataRelation) TableName() string {
return constant.TablePrefix + "data_relations"
}
// DataStorage 通用数据存储表
type DataStorage struct {
ID string `json:"id" gorm:"primaryKey;size:20"`
Type string `json:"type" gorm:"size:50;index;not null"`
Name string `json:"name" gorm:"size:255;index;not null"`
Data BigText `json:"data"`
CreatedAt LocalTime `json:"created_at"`
UpdatedAt LocalTime `json:"updated_at"`
}
func (DataStorage) TableName() string {
return constant.TablePrefix + "data_storages"
}
+1
View File
@@ -14,6 +14,7 @@ type EnvironmentVariable struct {
Hidden *bool `json:"hidden" gorm:"default:true"`
Enabled *bool `json:"enabled" gorm:"default:true"`
UserID string `json:"user_id" gorm:"size:20;index"`
Tags string `json:"-" gorm:"-"`
CreatedAt LocalTime `json:"created_at"`
UpdatedAt LocalTime `json:"updated_at"`
}
+2
View File
@@ -38,6 +38,7 @@ type EnvVO struct {
Value string `json:"value"`
Remark string `json:"remark"`
Type string `json:"type"`
Tags string `json:"tags"`
Hidden bool `json:"hidden"`
Enabled bool `json:"enabled"`
CreatedAt models.LocalTime `json:"created_at"`
@@ -59,6 +60,7 @@ func ToEnvVO(env *models.EnvironmentVariable) *EnvVO {
Value: val,
Remark: env.Remark,
Type: env.Type,
Tags: env.Tags,
Hidden: utils.DerefBool(env.Hidden, true),
Enabled: utils.DerefBool(env.Enabled, true),
CreatedAt: env.CreatedAt,
+1
View File
@@ -102,6 +102,7 @@ func registerEnvRoutes(g *gin.RouterGroup, c *Controllers) {
env := g.Group("/env")
{
env.GET("/secret-status", c.Env.GetSecretStatus)
env.GET("/tags", c.Env.GetTags)
env.POST("", c.Env.CreateEnvVar)
env.GET("", c.Env.GetEnvVars)
env.GET("/all", c.Env.GetAllEnvVars)
+131 -4
View File
@@ -43,6 +43,7 @@ func (es *EnvService) CreateEnvVar(name, value, remark, envType string, hidden,
func (es *EnvService) GetEnvVarsByUserID(userID string) []models.EnvironmentVariable {
var envs []models.EnvironmentVariable
database.DB.Where("user_id = ?", userID).Find(&envs)
es.LoadEnvTags(envs)
return envs
}
@@ -52,7 +53,7 @@ func (es *EnvService) GetFormattedEnvVarsByUserID(userID string) []string {
return es.formatEnvVars(envs)
}
func (es *EnvService) GetEnvVarsWithPagination(userID string, name string, envType string, page, pageSize int) ([]models.EnvironmentVariable, int64) {
func (es *EnvService) GetEnvVarsWithPagination(userID string, name string, envType string, tags string, page, pageSize int) ([]models.EnvironmentVariable, int64) {
var envs []models.EnvironmentVariable
var total int64
@@ -64,8 +65,35 @@ func (es *EnvService) GetEnvVarsWithPagination(userID string, name string, envTy
query = query.Where("type = ?", envType)
}
if tags != "" {
tagList := strings.Split(tags, ",")
var validTags []string
for _, t := range tagList {
t = strings.TrimSpace(t)
if t != "" {
validTags = append(validTags, t)
}
}
if len(validTags) > 0 {
var storageIDs []string
database.DB.Model(&models.DataStorage{}).Where("type = ? AND name IN ?", "env_tag", validTags).Pluck("id", &storageIDs)
var envIDs []string
if len(storageIDs) > 0 {
database.DB.Model(&models.DataRelation{}).Where("type = ? AND relate_id IN ?", "env_tag", storageIDs).Pluck("data_id", &envIDs)
}
if len(envIDs) > 0 {
query = query.Where("id IN ?", envIDs)
} else {
query = query.Where("1 = 0")
}
}
}
query.Count(&total)
query.Order("id DESC").Offset((page - 1) * pageSize).Limit(pageSize).Find(&envs)
es.LoadEnvTags(envs)
return envs, total
}
@@ -75,7 +103,9 @@ func (es *EnvService) GetEnvVarByID(id string) *models.EnvironmentVariable {
if res.Error != nil || res.RowsAffected == 0 {
return nil
}
return &env
envs := []models.EnvironmentVariable{env}
es.LoadEnvTags(envs)
return &envs[0]
}
func (es *EnvService) UpdateEnvVar(id string, name, value, remark, envType string, hidden, enabled bool) *models.EnvironmentVariable {
@@ -142,11 +172,19 @@ func (es *EnvService) DeleteEnvVar(id string, force bool) (bool, []models.Task)
}
return nil
})
return err == nil, nil
if err == nil {
es.CleanEnvTags(id)
return true, nil
}
return false, nil
}
result := database.DB.Where("id = ?", id).Delete(&models.EnvironmentVariable{})
return result.RowsAffected > 0, nil
if result.RowsAffected > 0 {
es.CleanEnvTags(id)
return true, nil
}
return false, nil
}
// GetEnvVarsByIDs 根据逗号分隔的ID字符串获取环境变量列表,返回 NAME=VALUE 格式
@@ -307,3 +345,92 @@ func splitEnvIDs(envIDs string) []string {
}
return ids
}
// SaveEnvTags 保存环境变量标签
func (es *EnvService) SaveEnvTags(envID string, tagsStr string) {
database.DB.Where("data_id = ? AND type = ?", envID, "env_tag").Delete(&models.DataRelation{})
if tagsStr == "" {
return
}
tags := strings.Split(tagsStr, ",")
for _, tag := range tags {
tag = strings.TrimSpace(tag)
if tag == "" {
continue
}
var storage models.DataStorage
res := database.DB.Where("type = ? AND name = ?", "env_tag", tag).Limit(1).Find(&storage)
if res.RowsAffected == 0 {
storage = models.DataStorage{
ID: utils.GenerateID(),
Type: "env_tag",
Name: tag,
CreatedAt: models.Now(),
UpdatedAt: models.Now(),
}
database.DB.Create(&storage)
}
relation := models.DataRelation{
ID: utils.GenerateID(),
DataID: envID,
RelateID: storage.ID,
Type: "env_tag",
CreatedAt: models.Now(),
UpdatedAt: models.Now(),
}
database.DB.Create(&relation)
}
}
// LoadEnvTags 为环境变量列表加载标签
func (es *EnvService) LoadEnvTags(envs []models.EnvironmentVariable) {
if len(envs) == 0 {
return
}
envIDs := make([]string, len(envs))
for i, e := range envs {
envIDs[i] = e.ID
}
var relations []models.DataRelation
database.DB.Where("data_id IN ? AND type = ?", envIDs, "env_tag").Find(&relations)
if len(relations) == 0 {
return
}
relateIDs := make([]string, len(relations))
for i, r := range relations {
relateIDs[i] = r.RelateID
}
var storages []models.DataStorage
database.DB.Where("id IN ? AND type = ?", relateIDs, "env_tag").Find(&storages)
storageMap := make(map[string]string)
for _, s := range storages {
storageMap[s.ID] = s.Name
}
envTagsMap := make(map[string][]string)
for _, r := range relations {
if name, ok := storageMap[r.RelateID]; ok {
envTagsMap[r.DataID] = append(envTagsMap[r.DataID], name)
}
}
for i, e := range envs {
if tags, ok := envTagsMap[e.ID]; ok {
envs[i].Tags = strings.Join(tags, ",")
}
}
}
// GetAllEnvTags 获取所有环境变量标签
func (es *EnvService) GetAllEnvTags() ([]string, error) {
var tags []string
err := database.DB.Model(&models.DataStorage{}).Where("type = ?", "env_tag").Pluck("name", &tags).Error
return tags, err
}
// CleanEnvTags 删除环境变量时清理关联标签记录
func (es *EnvService) CleanEnvTags(id string) {
database.DB.Where("data_id = ? AND type = ?", id, "env_tag").Delete(&models.DataRelation{})
}