- elm and weixin token refresh added.

This commit is contained in:
gazebo
2018-06-26 18:49:26 +08:00
parent 8ca0584794
commit 294a208d6c
6 changed files with 160 additions and 39 deletions

View File

@@ -72,7 +72,7 @@ func (o *OrderController) OrderStatusChanged(msg *elmapi.CallbackMsg, orderId st
return errResponseDBError
}
if rec.Type != msg.Type {
err = globals2.FreshFoodAPI.ELMOrderStatus(orderId, msg.Type, utils.GetCurTimestamp())
err = globals2.FreshFoodAPI.ELMOrderStatus(orderId, msg.Type, utils.GetCurTimeStr())
if err != nil {
return errResponseInternal
} else {

View File

@@ -102,7 +102,11 @@ func (f *FreshFoodAPI) AccessFreshFood(apiStr string, params url.Values) error {
var response *http.Response
fullURL := f.baseURL + "/" + apiStr
for i := 0; i < retryCount; i++ {
response, err = f.client.PostForm(fullURL, params)
if params != nil {
response, err = f.client.PostForm(fullURL, params)
} else {
response, err = f.client.Get(fullURL)
}
// err = error(nil)
// globals.SugarLogger.Debug(fullURL)
// globals.SugarLogger.Debug(params)
@@ -172,12 +176,12 @@ func (f *FreshFoodAPI) NewELMOrder(order map[string]interface{}) error {
return f.AccessFreshFood(URL_FRESHFOOD_ORDER_CREATE_ELEME, params)
}
func (f *FreshFoodAPI) ELMOrderStatus(orderId string, status int, timestamp int64) error {
func (f *FreshFoodAPI) ELMOrderStatus(orderId string, status int, statusTime string) error {
params := make(url.Values)
params.Set(URL_FRESHFOOD_PARA_VENDERID, utils.Int2Str(ELM_VENDERID))
params.Set(URL_FRESHFOOD_PARA_ORDERID, orderId)
params.Set(URL_FRESHFOOD_PARA_ORDERSTATUS, utils.Int2Str(status))
params.Set(URL_FRESHFOOD_PARA_ORDERSTATUSTIME, utils.Timestamp2Str(timestamp))
params.Set(URL_FRESHFOOD_PARA_ORDERSTATUSTIME, statusTime)
return f.AccessFreshFood(URL_FRESHFOOD_PARA_ORDERSTATUS, params)
}

View File

@@ -0,0 +1,8 @@
package models
type Config struct {
Id int
Thirdparty string `orm:"size(20);unique"`
Token string `orm:"size(300)"`
Date string `orm:"size(30)"`
}

View File

@@ -0,0 +1,90 @@
package tasks
import (
"time"
"git.rosy.net.cn/jx-callback/globals/globals2"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/business/models"
"github.com/astaxie/beego/orm"
)
const (
weixinTokenExpires = 7200 * time.Second
elmTokenExpires = 20 * 24 * 3600 * time.Second
)
func RefreshConfig(configKey string, expiresTime time.Duration, configGetter func() string) {
go func() {
sleepGap := expiresTime / 10
needRefreshGap := expiresTime * 8 / 10
for {
curConfig := &models.Config{
Thirdparty: configKey,
}
db := orm.NewOrm()
// 0: don't refresh, 1 update, 2 insert
handleType := 0
if err := db.Read(curConfig, "Thirdparty"); err != nil {
if err != orm.ErrNoRows {
globals.SugarLogger.Error("db error:%v", err)
} else {
curConfig.Token = configGetter()
handleType = 2
}
} else {
latestTimeStr := utils.Time2Str(time.Now().Add(-needRefreshGap))
if curConfig.Date <= latestTimeStr {
curConfig.Token = configGetter()
handleType = 1
}
}
if handleType != 0 {
globals.SugarLogger.Debug(configKey)
curConfig.Date = utils.GetCurTimeStr()
var num int64
var err error
if handleType == 1 {
num, err = db.Update(curConfig, "Token", "Date")
} else {
num, err = db.Insert(curConfig)
}
if err != nil || num == 0 {
globals.SugarLogger.Errorf("db error:%v, num:%d", err, num)
} else {
if configKey == "wechat" {
globals2.FreshFoodAPI.AccessFreshFood("weixin/accesstoken/update", nil)
} else if configKey == "eleme" {
globals2.FreshFoodAPI.AccessFreshFood("eleme/token/update", nil)
}
}
}
time.Sleep(sleepGap)
}
}()
}
func RefreshWeixinToken() {
RefreshConfig("wechat", weixinTokenExpires, func() string {
if tokenInfo, err := globals2.WeixinAPI.RefreshToken(); err == nil {
return tokenInfo.AccessToken
}
return ""
})
}
func RefreshElmToken() {
RefreshConfig("eleme", elmTokenExpires, func() string {
if tokenInfo, err := globals2.ElmAPI.RefreshToken(); err == nil {
return string(utils.MustMarshal(tokenInfo))
}
return ""
})
}