up

routes/router.go

@@ -3,21 +3,18 @@ package routes
 import (
 	"github.com/gin-gonic/gin"
 	"search_server/controller"
+	"search_server/middleware"
 )
 
 //初始化路由
 func InitRouter() *gin.Engine {
 	r := gin.New()
-<<<<<<< HEAD
-	//r.Use(gin.Logger())
-	//r.Use(gin.Recovery())
-	//r.Use(middleware.Cors())
-=======
+
 	r.Use(gin.Logger())
 	r.Use(gin.Recovery())
 	r.Use(middleware.Cors())
 	r.Use(middleware.ContextVars())
->>>>>>> 326ae7ed67d5d2db331dddd1277d36b8b1992b08
+
 	//路由
 	r.POST("/search/bom/autospu", controller.AutoSpu)
 	r.POST("/search/bom/recommend", controller.Recommend)