diff --git a/app/apis/canteen/canteenApi.go b/app/apis/canteen/canteenApi.go deleted file mode 100644 index 7adc28d..0000000 --- a/app/apis/canteen/canteenApi.go +++ /dev/null @@ -1,6 +0,0 @@ -package canteen - -import "funnel/app/apis" - -// 餐厅客流量的官方接口地址 -var FlowApi = apis.CANTEEN_URL + "/dist/api/BusinessData/GetPaymentCount" diff --git a/app/apis/rootUrls.go b/app/apis/rootUrls.go index 7f75768..56d0c19 100644 --- a/app/apis/rootUrls.go +++ b/app/apis/rootUrls.go @@ -11,8 +11,6 @@ import ( // //var ZF_Main_URL = os.Getenv("ZF_URL") //var ZF_BK_URL = os.Getenv("ZF_URL_BK") -// -//var CANTEEN_URL = os.Getenv("CANTEEN_URL") var LIBRARY_URL string = config.Config.GetString("library") @@ -22,5 +20,3 @@ var CAPTCHA_NEW_BREAKER_URL string = config.Config.GetString("captcha.new_breake var ZF_URL string = config.Config.GetString("zf.url") var ZF_Main_URL string = config.Config.GetString("zf.main_url") var ZF_BK_URL string = config.Config.GetString("zf.bk_url") - -var CANTEEN_URL string = config.Config.GetString("canteen") diff --git a/app/controller/canteenController/canteenController.go b/app/controller/canteenController/canteenController.go deleted file mode 100644 index 9b0e1d1..0000000 --- a/app/controller/canteenController/canteenController.go +++ /dev/null @@ -1,22 +0,0 @@ -package canteenController - -import ( - "fmt" - "funnel/app/errors" - "funnel/app/service/canteenService" - "funnel/app/utils" - "github.com/gin-gonic/gin" -) - -func Flow(content *gin.Context) { - data, err := canteenService.FetchFlow() - if err == nil { - utils.ContextDataResponseJson( - content, - utils.SuccessResponseJson(data)) - } else { - utils.ContextDataResponseJson( - content, - utils.FailResponseJson(errors.RequestFailed, fmt.Sprintf("%v: %v", data, err))) - } -} diff --git a/app/service/canteenService/flow.go b/app/service/canteenService/flow.go deleted file mode 100644 index 236162c..0000000 --- a/app/service/canteenService/flow.go +++ /dev/null @@ -1,35 +0,0 @@ -/* -用来向控制器提供客流量相关数据的服务 -*/ - -package canteenService - -import ( - "encoding/json" - "funnel/app/apis/canteen" - "funnel/app/utils/fetch" -) - -type response struct { - Data struct { - BeginTime string `json:"beginTime"` - EndTime string `json:"endTime"` - Data []struct { - DealCount string `json:"dealCount"` - RestaurantName string `json:"restaurantName"` - } `json:"data"` - } -} - -func FetchFlow() (interface{}, error) { - var client fetch.Fetch - client.Init() - result, err := client.Get(canteen.FlowApi) - if err != nil { // 获取数据失败 - return "fetchError", err - } else { // 获取数据成功 - var f response - err = json.Unmarshal(result, &f) - return f.Data, err // 返回抓取到的食堂客流量数据 - } -} diff --git a/config.example.yaml b/config.example.yaml index bfebdba..b4a01cb 100644 --- a/config.example.yaml +++ b/config.example.yaml @@ -17,5 +17,3 @@ zf: url: main_url: bk_url: - -canteen: \ No newline at end of file diff --git a/router/routers.go b/router/routers.go index 30d154f..8c0250d 100644 --- a/router/routers.go +++ b/router/routers.go @@ -1,7 +1,6 @@ package router import ( - "funnel/app/controller/canteenController" "funnel/app/controller/libraryController" "funnel/app/controller/zfController" "funnel/app/midware" @@ -32,10 +31,6 @@ func SetupRouter(r *gin.Engine) *gin.Engine { library.POST("/borrow/reborrow", libraryController.LibraryReBorrow) } } - canteen := r.Group("/canteen") - { - canteen.GET("/flow", canteenController.Flow) // 关于餐厅客流量的路由 - } return r }