From 65dd976fc7242e2ef2b0d35de09ad41eeb1dbc81 Mon Sep 17 00:00:00 2001
From: sian <sian@akuhome.com>
Date: Tue, 2 Aug 2022 16:41:32 +0800
Subject: [PATCH] bug fix

---
 internal/v2/controller/thirdPartyApi/holidays.go | 8 +++-----
 main.go                                          | 3 +--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/internal/v2/controller/thirdPartyApi/holidays.go b/internal/v2/controller/thirdPartyApi/holidays.go
index a83a73d..4c0589a 100644
--- a/internal/v2/controller/thirdPartyApi/holidays.go
+++ b/internal/v2/controller/thirdPartyApi/holidays.go
@@ -4,8 +4,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"recook/internal/back"
 	"recook/internal/v2/logic/thirdPartyApi"
-	"strconv"
-	"time"
+	"recook/tools"
 )
 
 type TianXingApi struct {
@@ -18,12 +17,11 @@ type argsHolidays struct {
 // GetHolidays 获取节假日并缓存
 func (t *TianXingApi) GetHolidays(c *gin.Context) {
 	var args argsHolidays
-	if err := c.ShouldBindJSON(&args); err != nil {
+	if err := tools.Params(&args, c); err != nil {
 		back.Fail(c, err.Error())
 		return
 	}
-	var nowYear = strconv.Itoa(time.Now().Year())
-	holidays, err := thirdPartyApi.TianXingApiLogic.GetHolidays(nowYear)
+	holidays, err := thirdPartyApi.TianXingApiLogic.GetHolidays(args.Year)
 	if err != nil {
 		back.Fail(c, err.Error())
 		return
diff --git a/main.go b/main.go
index a6583af..3d4d520 100644
--- a/main.go
+++ b/main.go
@@ -13,7 +13,6 @@ import (
 	_ "recook/internal/api/mobile/bill"
 	"recook/internal/api/store"
 	"recook/internal/api/vend"
-	"recook/internal/cron"
 	"recook/internal/dbc"
 	"recook/internal/mq"
 	"runtime"
@@ -148,7 +147,7 @@ func main() {
 		c.Stop()
 		close(idleConnClosed)
 	}()
-	cron.Task(c.Cron)
+	//cron.Task(c.Cron)
 	c.Start()
 	if err := g.Wait(); err != nil {
 		log.Fatal(err)