Commit c22590e4 authored by Cloud User's avatar Cloud User

use fiber redirect

parent e4d4d852
...@@ -1169,7 +1169,7 @@ func syncModeF(c *fiber.Ctx, taskid string) error { ...@@ -1169,7 +1169,7 @@ func syncModeF(c *fiber.Ctx, taskid string) error {
baseAttributes := []slog.Attr{} baseAttributes := []slog.Attr{}
baseAttributes = append(baseAttributes, slog.String(TaskIdAtrr, taskid)) baseAttributes = append(baseAttributes, slog.String(TaskIdAtrr, taskid))
newAttributes := append(baseAttributes, slog.String("TaskResultHeader", string(resAsPb.TaskResultHeader))) newAttributes := append(baseAttributes, slog.Int("resAsPb.TaskResultCode", int(resAsPb.TaskResultCode)), slog.String("TaskResultHeader", string(resAsPb.TaskResultHeader)))
slog.LogAttrs(c.UserContext(), slog.LevelInfo, "new Api or JWT reuqest", newAttributes...) slog.LogAttrs(c.UserContext(), slog.LevelInfo, "new Api or JWT reuqest", newAttributes...)
...@@ -1260,7 +1260,12 @@ func syncOrAsyncReturn(c *fiber.Ctx, resAsPb pbUpstream.TaskResponse, reqTaskId ...@@ -1260,7 +1260,12 @@ func syncOrAsyncReturn(c *fiber.Ctx, resAsPb pbUpstream.TaskResponse, reqTaskId
if redirectCode { if redirectCode {
if k == "Location" { if k == "Location" {
c.Response().Header.SetContentType(v)
c.Redirect(v, resAsPb.TaskResultCode)
//c.Response().Header.Set
//c.Response().Header.SetContentType(v)
//c.Set("Location", v)
} }
} }
} }
...@@ -1299,9 +1304,11 @@ func Return(c *fiber.Ctx, resAsPb pbUpstream.TaskResponse) error { ...@@ -1299,9 +1304,11 @@ func Return(c *fiber.Ctx, resAsPb pbUpstream.TaskResponse) error {
func redirectReturn(c *fiber.Ctx, resAsPb pbUpstream.TaskResponse) error { func redirectReturn(c *fiber.Ctx, resAsPb pbUpstream.TaskResponse) error {
//c.Status(int(resAsPb.TaskResultCode)).Response().Header.SetL
if resAsPb.TaskIsSucceed { if resAsPb.TaskIsSucceed {
return c.Status(int(resAsPb.TaskResultCode)).Send(resAsPb.GetTaskResultBody()) return c.Send(resAsPb.GetTaskResultBody())
} }
//fmt.Println("syncMode-------------", syncMode) //fmt.Println("syncMode-------------", syncMode)
...@@ -1314,6 +1321,6 @@ func redirectReturn(c *fiber.Ctx, resAsPb pbUpstream.TaskResponse) error { ...@@ -1314,6 +1321,6 @@ func redirectReturn(c *fiber.Ctx, resAsPb pbUpstream.TaskResponse) error {
TaskError: resAsPb.TaskError, TaskError: resAsPb.TaskError,
} }
return c.Status(int(resAsPb.TaskResultCode)).JSON(resAsJson) return c.JSON(resAsJson)
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment