OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 调整POST/PUT请求超时10s

Browse Source
This commit is contained in:
TsMask
2024-09-20 17:22:27 +08:00
parent 845d8453ed
commit 877e45ccb2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/framework/utils/fetch/fetch.go
View File

@@ -87,7 +87,7 @@ func Post(url string, data url.Values, headers map[string]string) ([]byte, error
// PostJSON 发送 POST 请求，并将请求体序列化为 JSON 格式 // PostJSON 发送 POST 请求，并将请求体序列化为 JSON 格式
func PostJSON(url string, data any, headers map[string]string) ([]byte, error) { func PostJSON(url string, data any, headers map[string]string) ([]byte, error) {
client := &http.Client{ client := &http.Client{
Timeout: 3 * time.Second, // 超时时间 Timeout: 10 * time.Second, // 超时时间
} }
jsonData, err := json.Marshal(data) jsonData, err := json.Marshal(data)
@@ -180,7 +180,7 @@ func PostUploadFile(url string, params map[string]string, file *os.File) ([]byte
// PutJSON 发送 PUT 请求，并将请求体序列化为 JSON 格式 // PutJSON 发送 PUT 请求，并将请求体序列化为 JSON 格式
func PutJSON(url string, data any, headers map[string]string) ([]byte, error) { func PutJSON(url string, data any, headers map[string]string) ([]byte, error) {
client := &http.Client{ client := &http.Client{
Timeout: 3 * time.Second, // 超时时间 Timeout: 10 * time.Second, // 超时时间
} }
jsonData, err := json.Marshal(data) jsonData, err := json.Marshal(data)

2
src/modules/network_element/fetch_link/ne_config.go
View File

@@ -54,7 +54,7 @@ func NeConfigOMC(neInfo model.NeInfo) (map[string]any, error) {
func NeConfigInfo(neInfo model.NeInfo, paramName string) (map[string]any, error) { func NeConfigInfo(neInfo model.NeInfo, paramName string) (map[string]any, error) {
// 网元参数配置信息 // 网元参数配置信息
neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType), paramName) neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType), paramName)
resBytes, err := fetch.Get(neUrl, nil, 60_000) resBytes, err := fetch.Get(neUrl, nil, 30_000)
if err != nil { if err != nil {
logger.Warnf("NeConfigInfo Get \"%s\"", neUrl) logger.Warnf("NeConfigInfo Get \"%s\"", neUrl)
logger.Errorf("NeConfigInfo %s", err.Error()) logger.Errorf("NeConfigInfo %s", err.Error())