diff --git a/api/Mindustry.go b/api/Mindustry.go index f4f4aa6..69e706b 100644 --- a/api/Mindustry.go +++ b/api/Mindustry.go @@ -7,17 +7,26 @@ import ( ) func GetInfo(w http.ResponseWriter, r *http.Request) { - if err := r.ParseForm(); err != nil { + var ( + err error + info utils.ServerInfo + ) + + if err = r.ParseForm(); err != nil { http.Error(w, "参数解析错误", http.StatusInternalServerError) } host := r.Form.Get("host") - info, err := utils.GetServerInfo(host) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + if host != "" { + info, err = utils.GetServerInfo(host) + //if err != nil { + // http.Error(w, err.Error(), http.StatusInternalServerError) + //} + // 如果需要返回JSON数据给客户端,可以使用以下代码 + w.Header().Set("Content-Type", "application/json;charset=utf-8") + err = json.NewEncoder(w).Encode(info) + } else { + http.Error(w, "参数为空", http.StatusInternalServerError) } - // 如果需要返回JSON数据给客户端,可以使用以下代码 - w.Header().Set("Content-Type", "application/json") - err = json.NewEncoder(w).Encode(info) if err != nil { http.Error(w, "无法解析服务器数据", http.StatusInternalServerError) } diff --git a/api/bilibili.go b/api/bilibili.go index 521578b..e1dbe86 100644 --- a/api/bilibili.go +++ b/api/bilibili.go @@ -218,7 +218,7 @@ func GetVideoData(w http.ResponseWriter, r *http.Request) { } // 如果需要返回JSON数据给客户端,可以使用以下代码 - w.Header().Set("Content-Type", "application/json") + w.Header().Set("Content-Type", "application/json;charset=utf-8") err = json.NewEncoder(w).Encode(info) if err != nil { http.Error(w, "无法解析视频数据", http.StatusInternalServerError)