Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-11-29 02:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix convert model.Inbound to form

Browse source
This commit is contained in:
Дмитрий Саенко 2025-10-23 16:23:26 +03:00
parent 430b0f07cd
commit 8fcb8c549a
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
web/service/inbound.go
View file

@ -2436,6 +2436,7 @@ func (s *InboundService) syncWithSlaves(method string, path string, contentType
case "application/x-www-form-urlencoded":
form := url.Values{}
switch v := bodyData.(type) {
case map[string]string:
for key, value := range v {
@ -2445,10 +2446,27 @@ func (s *InboundService) syncWithSlaves(method string, path string, contentType
for key, value := range v {
form.Set(key, fmt.Sprintf("%v", value))
}
case *model.Inbound:
// Try to marshal the struct to a map through JSON
// This is a universal way to convert struct to form
tmp := make(map[string]interface{})
data, err := json.Marshal(v)
if err != nil {
logger.Warningf("Failed to marshal struct to JSON for form encoding: %v", err)
continue
}
if err := json.Unmarshal(data, &tmp); err != nil {
logger.Warningf("Failed to unmarshal JSON to map for form encoding: %v", err)
continue
}
for key, value := range tmp {
form.Set(key, fmt.Sprintf("%v", value))
}
default:
logger.Warningf("Unsupported body type: %T for form encoding on server %s", v, server.Name)
continue
}
bodyReader = strings.NewReader(form.Encode())
default:
@ -2481,6 +2499,7 @@ func (s *InboundService) syncWithSlaves(method string, path string, contentType
bodyBytes, _ := io.ReadAll(resp.Body)
logger.Warningf("Failed to sync with server %s. Status: %s, Body: %s", server.Name, resp.Status, string(bodyBytes))
}
logger.Infof("Synced inbound %v to server %v (%v)", bodyData.(*model.Inbound).Tag, server.Name, resp.Status)
}
}