router

routers/router.go

@@ -20,7 +20,6 @@ func RouteInit() {
 	ns := beego.NewNamespace("/api",
 		// 解决跨域时 先发送 options 问题
 		beego.NSRouter("*", &controllers.BaseController{}, "options:Options"),
-<<<<<<< HEAD
 		// 菜单
 		beego.NSRouter("/menu", &menu.MenuController{}, "get:GetMenuList"),
 		// 自动回复
@@ -31,12 +30,10 @@ func RouteInit() {
 		beego.NSRouter("/autoreply/", &autoreply.AutoreplyController{}, "delete:DeleteAutoReply"),
 		//图片资源
 
-=======
 		beego.NSRouter("/ticket", &controllers.WechatController{}, "post:ComponentPush"),
 		beego.NSRouter("/ticket", &controllers.WechatController{}, "get:ComponentPush"),
 		beego.NSRouter("/:appid/callback", &controllers.WechatController{}, "get:WxReceive"),
 		beego.NSRouter("/:appid/callback", &controllers.WechatController{}, "post:WxReceive"),
->>>>>>> 930366a5cc940c92b07f4b0beed6405643d532df
 	)
 
 	beego.AddNamespace(ns)