liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2025-02-07 16:10:41 +08:00
parent 0d014afb6f
commit 9b6cf69baf
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
business/jxutils/tasks/configrefresh.go
View File

@@ -3,6 +3,7 @@ package tasks
import ( import (
"fmt" "fmt"
"git.rosy.net.cn/baseapi/platformapi/fnpsapi" "git.rosy.net.cn/baseapi/platformapi/fnpsapi"
beego "github.com/astaxie/beego/server/web"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"time" "time"
@@ -172,23 +173,25 @@ func RefreshFnToken() (err error) {
} }
api.FnAPI.SetToken(curConfig.Token) api.FnAPI.SetToken(curConfig.Token)
api.FnAPI.SetRefreshToken(curConfig.RefreshToken) 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 = ?` if beego.BConfig.RunMode == model.ServerTypeVegetable {
dao.ExecuteSQL(dao.GetDB(), sql, []interface{}{ if tokenInfo, err := api.FnAPI.GetAccessToken(); err == nil {
token, refreshToken, "fn", 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 { 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) 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 { 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) globals.SugarLogger.Debugf("菜市蜂鸟token通知到宠物错误:%v", err)
}
} }
return token, expireTimeStr, refreshToken return token, expireTimeStr, refreshToken

3
controllers/fn_callback.go
View File

@@ -114,10 +114,11 @@ func (c *FnController) FnToken() {
curConfig.Token = token.Token curConfig.Token = token.Token
curConfig.RefreshToken = token.RefreshToken curConfig.RefreshToken = token.RefreshToken
curConfig.Date = utils.Time2Str(time.Now()) curConfig.Date = utils.Time2Str(time.Now())
curConfig.LastOperator = "system"
api.FnAPI.SetToken(curConfig.Token) api.FnAPI.SetToken(curConfig.Token)
api.FnAPI.SetRefreshToken(curConfig.RefreshToken) 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.Data["json"] = &fnpsapi.SuccessResponse
c.ServeJSON() c.ServeJSON()
} else { } else {

9
main.go
View File

@@ -3,7 +3,6 @@ package main
import ( import (
"flag" "flag"
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/business/model"
"net/http" "net/http"
_ "net/http/pprof" _ "net/http/pprof"
"os" "os"
@@ -155,11 +154,9 @@ func main() {
return return
} }
if web.BConfig.RunMode != model.ServerTypeFruits && web.BConfig.RunMode != model.ServerTypePet { if err := tasks.RefreshFnToken(); err != nil {
if err := tasks.RefreshFnToken(); err != nil { globals.SugarLogger.Errorf("RefreshFnToken failed with error:%s", err)
globals.SugarLogger.Errorf("RefreshFnToken failed with error:%s", err) return
return
}
} }
if err := tasks.RefreshQywxToken(); err != nil { if err := tasks.RefreshQywxToken(); err != nil {
globals.SugarLogger.Errorf("RefreshQywxToken failed with error:%s", err) globals.SugarLogger.Errorf("RefreshQywxToken failed with error:%s", err)