Browse Source

fix:token的获取不再是强制更新,改成了获取当前可用token

Roc 1 year ago
parent
commit
520eee0d9d
1 changed files with 12 additions and 14 deletions
  1. 12 14
      services/base_from_ths_http.go

+ 12 - 14
services/base_from_ths_http.go

@@ -160,15 +160,14 @@ type BaseThsInterface struct {
 	Tables    interface{} `json:"tables"`
 }
 
-// postCurl post请求上海接口
+// postCurl post请求同花顺接口
 func postCurl(urlStr string, dataMap map[string]interface{}, num int) (body []byte, err error, errMsg string) {
 	logMsg := ``
 	defer func() {
 		if err != nil {
 			if logMsg != `` {
 				errMsg = logMsg
-				go alarm_msg.SendAlarmMsg("post请求上海接口失败,ERR:"+err.Error()+";errMsg:"+errMsg, 3)
-				//go utils.SendEmail(utils.APPNAME+"post请求上海接口失败:"+time.Now().Format("2006-01-02 15:04:05"), "post请求上海接口失败:"+errMsg, utils.EmailSendToUsers)
+				go alarm_msg.SendAlarmMsg("post请求同花顺接口失败,ERR:"+err.Error()+";errMsg:"+errMsg, 3)
 			}
 		}
 	}()
@@ -230,8 +229,7 @@ func postCurl(urlStr string, dataMap map[string]interface{}, num int) (body []by
 func GetAccessToken(isRefresh bool) (token string, err error) {
 	defer func() {
 		if err != nil {
-			go alarm_msg.SendAlarmMsg("获取上海的token失败,ERR:"+err.Error(), 3)
-			//go utils.SendEmail(utils.APPNAME+"获取上海的token失败:"+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("获取同花顺的token失败,ERR:"+err.Error(), 3)
 		}
 	}()
 	token, redisErr := utils.Rc.RedisString(tokenRedisKey)
@@ -246,8 +244,7 @@ func GetAccessToken(isRefresh bool) (token string, err error) {
 func refreshAccessToken() (token string, err error) {
 	defer func() {
 		if err != nil {
-			go alarm_msg.SendAlarmMsg("刷新上海的token失败;ERR:"+err.Error(), 3)
-			//go utils.SendEmail(utils.APPNAME+"刷新上海的token失败:"+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("刷新同花顺的token失败;ERR:"+err.Error(), 3)
 		}
 	}()
 	tokenInfo, tmpErr := getAccessToken()
@@ -260,14 +257,15 @@ func refreshAccessToken() (token string, err error) {
 	expireTime, err := time.ParseInLocation(utils.FormatDateTime, tokenInfo.ExpiredTime, time.Local)
 	if err != nil {
 		go alarm_msg.SendAlarmMsg("获取同花顺的token失败;同花顺token截止日期转换失败,ERR:"+err.Error(), 3)
-
+		return
 	}
 
 	//token存入redis
-	err = utils.Rc.Put(tokenRedisKey, token, time.Duration(expireTime.Unix()-600)*time.Second)
+	//err = utils.Rc.Put(tokenRedisKey, token, time.Duration(expireTime.Unix()-600)*time.Second)
+	// 本来是要设置下600s的过期时间,但因为不是强制刷新token,就不获取了
+	err = utils.Rc.Put(tokenRedisKey, token, time.Duration(expireTime.Unix())*time.Second)
 	if err != nil {
-		go alarm_msg.SendAlarmMsg("获取同花顺的token失败;同花顺token存入redis失败,ERR:"+err.Error(), 3)
-		//go utils.SendEmail(utils.APPNAME+"获取上海的token失败:"+time.Now().Format("2006-01-02 15:04:05"), "上海token存入redis失败:", utils.EmailSendToUsers)
+		go alarm_msg.SendAlarmMsg("获取同花顺的token成功;同花顺token存入redis失败,ERR:"+err.Error(), 3)
 	}
 	return
 }
@@ -288,11 +286,11 @@ type TokenData struct {
 func getAccessToken() (tokenData TokenData, err error) {
 	defer func() {
 		if err != nil {
-			go alarm_msg.SendAlarmMsg("更新上海的token失败;ERR:"+err.Error(), 3)
-			//go utils.SendEmail(utils.APPNAME+"更新上海的token失败:"+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("更新同花顺的token失败;ERR:"+err.Error(), 3)
 		}
 	}()
-	getUrl := `https://quantapi.51ifind.com/api/v1/update_access_token`
+	//getUrl := `https://quantapi.51ifind.com/api/v1/update_access_token`	// 强制刷新token;目前因为生产和测试都是使用的一个账号,所以token不能因为环境的不同而改变
+	getUrl := `https://quantapi.51ifind.com/api/v1/get_access_token` // 获取当前token
 
 	req, _ := netHttp.NewRequest("GET", getUrl, nil)
 	req.Header.Add("Content-Type", "application/json")