|
@@ -4,7 +4,6 @@ import (
|
|
"context"
|
|
"context"
|
|
"encoding/json"
|
|
"encoding/json"
|
|
"errors"
|
|
"errors"
|
|
- "fmt"
|
|
|
|
"github.com/gogf/gf/encoding/gjson"
|
|
"github.com/gogf/gf/encoding/gjson"
|
|
"sparrow/pkg/productconfig"
|
|
"sparrow/pkg/productconfig"
|
|
"sparrow/pkg/rpcs"
|
|
"sparrow/pkg/rpcs"
|
|
@@ -431,9 +430,8 @@ func SubmitSceneTask(req *http.Request, r render.Render) {
|
|
r.JSON(http.StatusOK, renderError(ErrWrongRequestFormat, err))
|
|
r.JSON(http.StatusOK, renderError(ErrWrongRequestFormat, err))
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- fmt.Printf("type:%s,data:%s", ruleReq.Type, ruleReq.Data)
|
|
|
|
reply := rpcs.ReplySubmitTask{}
|
|
reply := rpcs.ReplySubmitTask{}
|
|
- err = server.RPCCallByName(nil, rpcs.SceneAccessServiceName, "SceneService.SubmitTask", ruleReq, reply)
|
|
|
|
|
|
+ err = server.RPCCallByName(nil, rpcs.SceneAccessServiceName, "SceneService.SubmitTask", ruleReq, &reply)
|
|
if err != nil {
|
|
if err != nil {
|
|
server.Log.Errorf("submit sceneTask error: %v", err)
|
|
server.Log.Errorf("submit sceneTask error: %v", err)
|
|
r.JSON(http.StatusOK, renderError(ErrSystemFault, err))
|
|
r.JSON(http.StatusOK, renderError(ErrSystemFault, err))
|
|
@@ -454,7 +452,7 @@ func SubmitTaskLifecycle(req *http.Request, r render.Render) {
|
|
}
|
|
}
|
|
|
|
|
|
reply := rpcs.ReplySubmitTask{}
|
|
reply := rpcs.ReplySubmitTask{}
|
|
- err = server.RPCCallByName(nil, rpcs.SceneAccessServiceName, "SceneService.SubmitTaskLifecycle", ruleReq, reply)
|
|
|
|
|
|
+ err = server.RPCCallByName(nil, rpcs.SceneAccessServiceName, "SceneService.SubmitTaskLifecycle", ruleReq, &reply)
|
|
if err != nil {
|
|
if err != nil {
|
|
r.JSON(http.StatusOK, renderError(ErrWrongSecret, errors.New("invalid secret key")))
|
|
r.JSON(http.StatusOK, renderError(ErrWrongSecret, errors.New("invalid secret key")))
|
|
server.Log.Errorf("submit taskLifecycle error: %v", err)
|
|
server.Log.Errorf("submit taskLifecycle error: %v", err)
|