Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
power-node
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Odysseus
power-node
Commits
559ca15b
Commit
559ca15b
authored
Mar 18, 2024
by
duanjinfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update json marshal encoding
parent
ff6354a4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
18 deletions
+18
-18
node_manager.go
models/node_manager.go
+6
-6
task_msg.go
nm/task_msg.go
+12
-12
No files found.
models/node_manager.go
View file @
559ca15b
...
...
@@ -39,12 +39,12 @@ type TaskResult struct {
}
type
ApiResp
struct
{
TaskId
string
`json:"task_id"`
TaskResult
[]
byte
`json:"task_result"`
TaskUid
string
`json:"task_uid"`
TaskFee
string
`json:"task_fee"`
IsSuccess
bool
`json:"is_success"`
TaskError
string
`json:"task_error"`
TaskId
string
`json:"task_id"`
TaskResult
[]
string
`json:"task_result"`
TaskUid
string
`json:"task_uid"`
TaskFee
string
`json:"task_fee"`
IsSuccess
bool
`json:"is_success"`
TaskError
string
`json:"task_error"`
}
type
HardwareRequire
struct
{
...
...
nm/task_msg.go
View file @
559ca15b
...
...
@@ -289,23 +289,23 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
}
}
if
len
(
apiRes
)
>
1
{
fileCacheBody
:=
bytes
.
NewBuffer
([]
byte
{})
encoder
:=
json
.
NewEncoder
(
fileCacheBody
)
encoder
.
SetEscapeHTML
(
false
)
err
:=
encoder
.
Encode
(
apiRes
)
if
err
!=
nil
{
log
.
WithError
(
err
)
.
Error
(
"encoder Encode"
)
}
res
:=
&
models
.
ApiResp
{
IsSuccess
:
true
,
TaskResult
:
fileCacheBody
.
Bytes
()
,
TaskResult
:
apiRes
,
}
apiResBody
,
err
:=
json
.
Marshal
(
res
)
apiResBody
:=
bytes
.
NewBuffer
([]
byte
{})
encoder
:=
json
.
NewEncoder
(
apiResBody
)
encoder
.
SetEscapeHTML
(
false
)
err
:=
encoder
.
Encode
(
res
)
if
err
!=
nil
{
log
.
WithError
(
err
)
.
Error
(
"
json marshal upload oss uri
"
)
log
.
WithError
(
err
)
.
Error
(
"
encoder Encode
"
)
}
log
.
WithField
(
"apiResBody"
,
string
(
apiResBody
))
.
Info
(
"model resp"
)
taskExecResult
.
TaskRespBody
=
apiResBody
//apiResBody, err := json.Marshal(res)
//if err != nil {
// log.WithError(err).Error("json marshal upload oss uri")
//}
log
.
WithField
(
"apiResBody"
,
string
(
apiResBody
.
Bytes
()))
.
Info
(
"model resp"
)
taskExecResult
.
TaskRespBody
=
apiResBody
.
Bytes
()
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment