From 2747e6f1c5ba30cce678d80558d221c81288945a Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 15 Apr 2019 13:27:45 +0800 Subject: [PATCH] - remove agentId from dingapi.Sign --- controllers/dingding_api.go | 2 -- routers/commentsRouter_controllers.go | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/controllers/dingding_api.go b/controllers/dingding_api.go index 79fbafbad..5cfdfede0 100644 --- a/controllers/dingding_api.go +++ b/controllers/dingding_api.go @@ -32,7 +32,6 @@ func init() { // @Param url query string true "当前网页的URL,不包含#及其后面部分" // @Param nonceStr query string true "随机串,自己定义" // @Param timeStamp query string true "时间戳" -// @Param agentId query string false "应用的标识" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /Sign [get] @@ -48,7 +47,6 @@ func (c *DDAPIController) Sign() { if err == nil { retVal = fmt.Sprintf("%x", sha1.Sum([]byte("jsapi_ticket="+ddapi.Ticket+ "&noncestr="+params.NonceStr+"×tamp="+params.TimeStamp+"&url="+params.Url))) - } return retVal, "", err }) diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 79f8bf0a6..da5568da8 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -295,6 +295,15 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:DDAPIController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:DDAPIController"], + beego.ControllerComments{ + Method: "Sign", + Router: `/Sign`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:FinancialController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:FinancialController"], beego.ControllerComments{ Method: "GetOrdersFinancial", @@ -520,6 +529,15 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"], + beego.ControllerComments{ + Method: "AdjustOrder", + Router: `/AdjustOrder`, + AllowHTTPMethods: []string{"put"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"], beego.ControllerComments{ Method: "CancelAll3rdWaybills", @@ -529,6 +547,15 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"], + beego.ControllerComments{ + Method: "CancelOrder", + Router: `/CancelOrder`, + AllowHTTPMethods: []string{"put"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"], beego.ControllerComments{ Method: "CreateWaybillOnProviders",