Merge branch 'master' into jxstore

This commit is contained in:
gazebo
2018-09-04 22:20:05 +08:00
15 changed files with 429 additions and 1226 deletions

View File

@@ -7,6 +7,38 @@ import (
func init() {
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:AuthController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:AuthController"],
beego.ControllerComments{
Method: "GetUserInfo",
Router: `/GetUserInfo`,
AllowHTTPMethods: []string{"get"},
MethodParams: param.Make(),
Params: nil})
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:AuthController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:AuthController"],
beego.ControllerComments{
Method: "GetWeiXinUserInfo",
Router: `/GetWeiXinUserInfo`,
AllowHTTPMethods: []string{"get"},
MethodParams: param.Make(),
Params: nil})
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:AuthController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:AuthController"],
beego.ControllerComments{
Method: "Login",
Router: `/Login`,
AllowHTTPMethods: []string{"post"},
MethodParams: param.Make(),
Params: nil})
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:AuthController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:AuthController"],
beego.ControllerComments{
Method: "Logout",
Router: `/Logout`,
AllowHTTPMethods: []string{"delete"},
MethodParams: param.Make(),
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",

View File

@@ -31,6 +31,11 @@ func init() {
&controllers.StoreController{},
),
),
beego.NSNamespace("/auth",
beego.NSInclude(
&controllers.AuthController{},
),
),
)
beego.AddNamespace(ns)