From dbc843d0b37f786fb816131bcc7ebca86dbe72e9 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期四, 06 八月 2020 09:58:46 +0800
Subject: [PATCH] add crossRecord

---
 controllers/restriction.go |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/controllers/restriction.go b/controllers/restriction.go
index 8ce48ce..37ede7b 100644
--- a/controllers/restriction.go
+++ b/controllers/restriction.go
@@ -4,6 +4,7 @@
 	"car-service/extend/code"
 	"car-service/extend/util"
 	"encoding/json"
+	"fmt"
 	"github.com/astaxie/beego"
 	"net/http"
 	"github.com/robfig/cron"
@@ -13,11 +14,15 @@
 	beego.Controller
 }
 
+func init() {
+	getRestrictionInfo()
+}
+
 // @Title 鏌ヨ闄愯灏惧彿
 // @Description 鏌ヨ闄愯灏惧彿
 // @Success 200 {object} controllers.RestrictionResult
 // @Failure 403 {string} json ""
-// @router /spaceNo [get]
+// @router /restriction [get]
 func (c *RestrictionController) Restriction() {
 	resp := code.Code{}
 	if todayRes !=nil {
@@ -27,7 +32,7 @@
 	} else {
 		resp.Success= false
 		resp.Status= http.StatusBadRequest
-		resp.Data= nil
+		resp.Data= "鏁版嵁璇锋眰澶辫触锛岃绋嶅悗閲嶈瘯"
 	}
 	c.Data["json"] = resp
 	c.ServeJSON()
@@ -37,8 +42,8 @@
 
 func Schedule() {
 	c := cron.New()
-	//姣忓皬鏃剁洃娴嬩竴娆℃槸鍚﹁繃鏈�
-	c.AddFunc("0 0 * * * ?", func() {
+	//姣忓ぉ鍑屾櫒5鐐规墽琛屼竴娆★紝鑾峰彇褰撴棩鏁版嵁
+	c.AddFunc("0 0 1 * * ?", func() {
 		todayRes = nil
 		getRestrictionInfo()
 	})
@@ -49,6 +54,7 @@
 	Date 		string 		`json:"date"`
 	Week 		string 		`json:"week"`
 	CityName 	string		`json:"cityName"`
+	IsXianXing 	int 		`json:"isxianxing"`
 	XxWeiHao 	[]int		`json:"xxWeiHao"`
 }
 
@@ -72,15 +78,17 @@
 }
 
 func getRestrictionInfo() {
-	juHeAppKey := ""
+	juHeAppKey := beego.AppConfig.String("juheweihaokey")
 	url := "http://v.juhe.cn/xianxing/index?key="+ juHeAppKey +"&city=beijing&type=1"
 	b, err := util.DoPostRequest(url, util.CONTENT_TYPE_JSON, nil, nil, nil)
 	if err != nil {
+		fmt.Println("err:", err)
 		return
 	}
 	var result JuHeResult
 	err = json.Unmarshal(b, &result)
 	if err != nil {
+		fmt.Println("unmarshal err:", err)
 		return
 	}
 	if result.ErrorCode == 0 {
@@ -88,6 +96,7 @@
 			Date: result.Result.Date,
 			Week: result.Result.Week,
 			CityName: result.Result.CityName,
+			IsXianXing: result.Result.IsXianXing,
 			XxWeiHao: result.Result.XXWeiHao,
 		}
 	}

--
Gitblit v1.8.0