test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-04 04:38:04 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #875 from yangkaa/master

Browse Source 
Fix Bug: The config group created the variable in the inactive state
This commit is contained in:
黄润豪 2020-11-18 09:28:51 +08:00 committed by GitHub
commit a4ae8f0612
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/handler/application_config_group.go
View File

@ -63,6 +63,7 @@ func (a *ApplicationAction) AddConfigGroup(appID string, req *model.ApplicationC
AppID: appID,
ConfigGroupName: req.ConfigGroupName,
DeployType: req.DeployType,
Enable: req.Enable,
}
if err := db.GetManager().AppConfigGroupDaoTransactions(tx).AddModel(config); err != nil {
tx.Rollback()
@ -93,6 +94,7 @@ func (a *ApplicationAction) AddConfigGroup(appID string, req *model.ApplicationC
DeployType: appconfig.DeployType,
ConfigItems: configGroupItems,
Services: configGroupServices,
Enable: appconfig.Enable,
}
return resp, nil
}
@ -115,6 +117,12 @@ func (a *ApplicationAction) UpdateConfigGroup(appID, configGroupName string, req
tx.Rollback()
}
}()
// Update effective status
appconfig.Enable = req.Enable
if err := db.GetManager().AppConfigGroupDaoTransactions(tx).UpdateModel(appconfig); err != nil {
tx.Rollback()
return nil, err
}
// Update application configGroup-services
if err := db.GetManager().AppConfigGroupServiceDaoTransactions(tx).DeleteConfigGroupService(appID, configGroupName); err != nil {
tx.Rollback()
@ -172,6 +180,7 @@ func (a *ApplicationAction) UpdateConfigGroup(appID, configGroupName string, req
DeployType: appconfig.DeployType,
ConfigItems: configGroupItems,
Services: configGroupServices,
Enable: appconfig.Enable,
}
return resp, nil
}
@ -222,6 +231,7 @@ func (a *ApplicationAction) ListConfigGroups(appID string, page, pageSize int) (
AppID: c.AppID,
ConfigGroupName: c.ConfigGroupName,
DeployType: c.DeployType,
Enable: c.Enable,
}
configGroupServices, err := db.GetManager().AppConfigGroupServiceDao().GetConfigGroupServicesByID(c.AppID, c.ConfigGroupName)

3
api/model/model.go
View File

@ -1697,6 +1697,7 @@ type ApplicationConfigGroup struct {
DeployType string `json:"deploy_type" validate:"required,oneof=env configfile"`
ServiceIDs []string `json:"service_ids"`
ConfigItems []ConfigItem `json:"config_items"`
Enable bool `json:"enable"`
}
// ApplicationConfigGroupResp -
@ -1707,12 +1708,14 @@ type ApplicationConfigGroupResp struct {
DeployType string `json:"deploy_type"`
Services []*dbmodel.ConfigGroupService `json:"services"`
ConfigItems []*dbmodel.ConfigGroupItem `json:"config_items"`
Enable bool `json:"enable"`
}
// UpdateAppConfigGroupReq -
type UpdateAppConfigGroupReq struct {
ServiceIDs []string `json:"service_ids"`
ConfigItems []ConfigItem `json:"config_items" validate:"required"`
Enable bool `json:"enable"`
}
// ListApplicationConfigGroupResp -

1
db/model/application.go
View File

@ -60,6 +60,7 @@ type ApplicationConfigGroup struct {
AppID string `gorm:"column:app_id" json:"app_id"`
ConfigGroupName string `gorm:"column:config_group_name" json:"config_group_name"`
DeployType string `gorm:"column:deploy_type;default:'env'" json:"deploy_type"`
Enable bool `gorm:"column:enable" json:"enable"`
}
// TableName return tableName "application"

5
db/mysql/dao/application_config_group.go
View File

@ -26,7 +26,8 @@ func (a *AppConfigGroupDaoImpl) AddModel(mo model.Interface) error {
//UpdateModel -
func (a *AppConfigGroupDaoImpl) UpdateModel(mo model.Interface) error {
return nil
updateReq := mo.(*model.ApplicationConfigGroup)
return a.DB.Model(&model.ApplicationConfigGroup{}).Where("app_id = ? AND config_group_name = ?", updateReq.AppID, updateReq.ConfigGroupName).Update("enable", updateReq.Enable).Error
}
// GetConfigGroupByID -
@ -41,7 +42,7 @@ func (a *AppConfigGroupDaoImpl) GetConfigGroupByID(appID, configGroupName string
func (a *AppConfigGroupDaoImpl) ListByServiceID(sid string) ([]*model.ApplicationConfigGroup, error) {
var groups []*model.ApplicationConfigGroup
if err := a.DB.Model(model.ApplicationConfigGroup{}).Select("app_config_group.*").Joins("left join app_config_group_service on app_config_group.app_id = app_config_group_service.app_id and app_config_group.config_group_name = app_config_group_service.config_group_name").
Where("app_config_group_service.service_id = ?", sid).Scan(&groups).Error; err != nil {
Where("app_config_group_service.service_id = ? and enable = true", sid).Scan(&groups).Error; err != nil {
return nil, err
}
return groups, nil