查询job详情 bug修复

routers/v1/job.go

@@ -108,15 +108,17 @@ func JobInfo(ctx *gin.Context) {
 	url := req.Server + "/slurm/" + req.Version + "/job/" + req.JobId
 	client := &http.Client{}
 	request, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return
-	}
+
 	if err != nil {
 		fmt.Println(err)
 		return
 	}
 	request.Header.Add("Accept", "*/*")
-	request.Header.Add("Host", "192.168.87.196:6820")
+	request.Header.Add("Host", req.Server)
+	request.Header.Add("X-SLURM-USER-NAME", req.Username)
+	request.Header.Add("X-SLURM-USER-TOKEN", req.Token)
+	request.Header.Add("Cookie", "X-SLURM-USER-NAME=;X-SLURM-USER-TOKEN=")
+	request.Header.Add("Content-Type", "application/json")
 
 	res, err := client.Do(request)
 	if err != nil {
@@ -130,18 +132,7 @@ func JobInfo(ctx *gin.Context) {
 		fmt.Println(err)
 		return
 	}
-	fmt.Println(string(body))
-
 	var resp slurm.GetJobResp
-	bytes, err := json.Marshal(res)
-	if err != nil {
-		return
-	}
-	json.Unmarshal(bytes, &resp)
-	logx.Info("调用rest api接口完成")
-	if err != nil {
-		Response(ctx, http.StatusInternalServerError, "rest api error.", err)
-	}
-
-	Response(ctx, http.StatusOK, "success", resp)
+	json.Unmarshal(body, &resp)
+	ResponseData(ctx, &resp)
 }

routers/v1/response.go

@@ -13,3 +13,8 @@ func Response(c *gin.Context, code int, msg interface{}, data interface{}) {
 	})
 	return
 }
+
+func ResponseData(c *gin.Context, data interface{}) {
+	c.JSON(http.StatusOK, data)
+	return
+}