Skip to content

Commit 41a2b2b

Browse files
ZhengYa-0110SongZhen0704
authored andcommitted
fix: sets wrong domain filter value in agent group config
1 parent 810f39f commit 41a2b2b

File tree

2 files changed

+2
-38
lines changed

2 files changed

+2
-38
lines changed

server/agent_config/migrator.go

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -206,42 +206,6 @@ func (m *Upgrader) fmtLowerVersionValue(longKey string, value interface{}) inter
206206
default:
207207
return []int{}
208208
}
209-
} else if longKey == "domains" {
210-
switch value := value.(type) {
211-
case []interface{}:
212-
if len(value) == 0 {
213-
return []int{}
214-
}
215-
switch item := value[0].(type) {
216-
case string:
217-
result := make([]int, 0)
218-
if len(value) == 1 && item == "0" {
219-
return []int{0}
220-
}
221-
for i := range value {
222-
if id, ok := m.domainData.LcuuidToID[value[i].(string)]; ok {
223-
result = append(result, id)
224-
}
225-
}
226-
return result
227-
default:
228-
log.Warnf("failed to convert %s to list: %v", longKey, value)
229-
return []int{}
230-
}
231-
case []string:
232-
result := make([]int, 0)
233-
if len(value) == 1 && value[0] == "0" {
234-
return []int{0}
235-
}
236-
for i := range value {
237-
if id, ok := m.domainData.LcuuidToID[value[i]]; ok {
238-
result = append(result, id)
239-
}
240-
}
241-
return result
242-
default:
243-
}
244-
return []int{}
245209
} else if slices.Contains(m.lowerVersionIntToBoolKeys, longKey) {
246210
switch value := value.(type) {
247211
case int:

server/controller/http/service/agent_group_config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ func (a *AgentGroupConfig) GetAgentGroupConfigTemplateJson() ([]byte, error) {
124124
return nil, err
125125
}
126126
var domains []model.Domain
127-
if err := dbInfo.Select("id", "name").Find(&domains).Error; err != nil {
127+
if err := dbInfo.Select("lcuuid", "name").Find(&domains).Error; err != nil {
128128
return nil, err
129129
}
130130
domainInfos := make([]map[string]interface{}, len(domains))
131131
for i, domain := range domains {
132132
domainInfos[i] = map[string]interface{}{
133-
strconv.Itoa(domain.ID): map[string]interface{}{
133+
domain.Lcuuid: map[string]interface{}{
134134
"ch": domain.Name,
135135
"en": domain.Name,
136136
},

0 commit comments

Comments
 (0)