1
This commit is contained in:
@@ -3,6 +3,7 @@ package tasks
|
||||
import (
|
||||
"fmt"
|
||||
"git.rosy.net.cn/baseapi/platformapi/fnpsapi"
|
||||
beego "github.com/astaxie/beego/server/web"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"time"
|
||||
@@ -172,23 +173,25 @@ func RefreshFnToken() (err error) {
|
||||
}
|
||||
api.FnAPI.SetToken(curConfig.Token)
|
||||
api.FnAPI.SetRefreshToken(curConfig.RefreshToken)
|
||||
if tokenInfo, err := api.FnAPI.GetAccessToken(); err == nil {
|
||||
token = tokenInfo.BusinessDataObj.AccessToken
|
||||
refreshToken = tokenInfo.BusinessDataObj.RefreshToken
|
||||
} else {
|
||||
globals.SugarLogger.Errorf("RefreshFnToken RefreshToken failed with error:%v", err)
|
||||
}
|
||||
|
||||
sql := `UPDATE config SET token = ?,refresh_token = ? WHERE thirdparty = ?`
|
||||
dao.ExecuteSQL(dao.GetDB(), sql, []interface{}{
|
||||
token, refreshToken, "fn",
|
||||
})
|
||||
if beego.BConfig.RunMode == model.ServerTypeVegetable {
|
||||
if tokenInfo, err := api.FnAPI.GetAccessToken(); err == nil {
|
||||
token = tokenInfo.BusinessDataObj.AccessToken
|
||||
refreshToken = tokenInfo.BusinessDataObj.RefreshToken
|
||||
} else {
|
||||
globals.SugarLogger.Errorf("RefreshFnToken RefreshToken failed with error:%v", err)
|
||||
}
|
||||
sql := `UPDATE config SET token = ?,refresh_token = ? WHERE thirdparty = ?`
|
||||
dao.ExecuteSQL(dao.GetDB(), sql, []interface{}{
|
||||
token, refreshToken, "fn",
|
||||
})
|
||||
|
||||
if _, err = fnpsapi.HttpToGuoYuanFN(map[string]interface{}{"token": curConfig.Token, "refresh_token": curConfig.RefreshToken}, fnpsapi.FengNiaoCallbackTypeToken, model.ServerTypeVegetable); err != nil {
|
||||
globals.SugarLogger.Debugf("菜市蜂鸟token通知到果园错误:%v", err)
|
||||
}
|
||||
if _, err = fnpsapi.HttpToGuoYuanFN(map[string]interface{}{"token": curConfig.Token, "refresh_token": curConfig.RefreshToken}, fnpsapi.FengNiaoCallbackTypeToken, model.ServerTypeFruits); err != nil {
|
||||
globals.SugarLogger.Debugf("菜市蜂鸟token通知到宠物错误:%v", err)
|
||||
if _, err = fnpsapi.HttpToGuoYuanFN(map[string]interface{}{"token": curConfig.Token, "refresh_token": curConfig.RefreshToken}, fnpsapi.FengNiaoCallbackTypeToken, model.ServerTypeVegetable); err != nil {
|
||||
globals.SugarLogger.Debugf("菜市蜂鸟token通知到果园错误:%v", err)
|
||||
}
|
||||
if _, err = fnpsapi.HttpToGuoYuanFN(map[string]interface{}{"token": curConfig.Token, "refresh_token": curConfig.RefreshToken}, fnpsapi.FengNiaoCallbackTypeToken, model.ServerTypeFruits); err != nil {
|
||||
globals.SugarLogger.Debugf("菜市蜂鸟token通知到宠物错误:%v", err)
|
||||
}
|
||||
}
|
||||
|
||||
return token, expireTimeStr, refreshToken
|
||||
|
||||
@@ -114,10 +114,11 @@ func (c *FnController) FnToken() {
|
||||
curConfig.Token = token.Token
|
||||
curConfig.RefreshToken = token.RefreshToken
|
||||
curConfig.Date = utils.Time2Str(time.Now())
|
||||
curConfig.LastOperator = "system"
|
||||
api.FnAPI.SetToken(curConfig.Token)
|
||||
api.FnAPI.SetRefreshToken(curConfig.RefreshToken)
|
||||
|
||||
dao.UpdateEntity(db, curConfig, "Token", "RefreshToken", "Date")
|
||||
dao.UpdateEntity(db, curConfig, "Token", "RefreshToken", "Date", "LastOperator")
|
||||
c.Data["json"] = &fnpsapi.SuccessResponse
|
||||
c.ServeJSON()
|
||||
} else {
|
||||
|
||||
9
main.go
9
main.go
@@ -3,7 +3,6 @@ package main
|
||||
import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"git.rosy.net.cn/jx-callback/business/model"
|
||||
"net/http"
|
||||
_ "net/http/pprof"
|
||||
"os"
|
||||
@@ -155,11 +154,9 @@ func main() {
|
||||
return
|
||||
}
|
||||
|
||||
if web.BConfig.RunMode != model.ServerTypeFruits && web.BConfig.RunMode != model.ServerTypePet {
|
||||
if err := tasks.RefreshFnToken(); err != nil {
|
||||
globals.SugarLogger.Errorf("RefreshFnToken failed with error:%s", err)
|
||||
return
|
||||
}
|
||||
if err := tasks.RefreshFnToken(); err != nil {
|
||||
globals.SugarLogger.Errorf("RefreshFnToken failed with error:%s", err)
|
||||
return
|
||||
}
|
||||
if err := tasks.RefreshQywxToken(); err != nil {
|
||||
globals.SugarLogger.Errorf("RefreshQywxToken failed with error:%s", err)
|
||||
|
||||
Reference in New Issue
Block a user