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

修改蜂鸟

Browse Source
This commit is contained in:
邹宗楠
2022-03-28 10:25:59 +08:00
parent e3357b4b44
commit 02928cc5fa
2 changed files with 29 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ type CallResult struct {
Data string `json:"data"` Data string `json:"data"`
} }
func RefreshConfig(configKey string, expiresTime time.Duration, configGetter func() (string, string), configSetter func(value, value2 string)) error { func RefreshConfig(configKey string, expiresTime time.Duration, configGetter func() (string, string, string), configSetter func(value, value2 string)) error {
needRefreshGap := expiresTime * 8 / 10 needRefreshGap := expiresTime * 8 / 10
sleepGap := expiresTime / 10 sleepGap := expiresTime / 10
if sleepGap > maxRefreshGap { if sleepGap > maxRefreshGap {
@@ -70,7 +70,7 @@ func RefreshConfig(configKey string, expiresTime time.Duration, configGetter fun
} }
} }
if handleType != 0 { if handleType != 0 {
if curConfig.Token, curConfig.Date = configGetter(); curConfig.Token == "" { if curConfig.Token, curConfig.Date, curConfig.RefreshToken = configGetter(); curConfig.Token == "" {
if globals.IsProductEnv() { if globals.IsProductEnv() {
globals.SugarLogger.Infof("RefreshConfig %s get empty token", configKey) globals.SugarLogger.Infof("RefreshConfig %s get empty token", configKey)
sleepDuration = errRefreshGap sleepDuration = errRefreshGap
@@ -115,7 +115,7 @@ func RefreshConfig(configKey string, expiresTime time.Duration, configGetter fun
func RefreshWeixinToken() (err error) { func RefreshWeixinToken() (err error) {
if api.WeixinAPI != nil { if api.WeixinAPI != nil {
err = RefreshConfig("wechat", weixinTokenExpires, func() (token string, expireTimeStr string) { err = RefreshConfig("wechat", weixinTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) {
globals.SugarLogger.Debugf("RefreshWeixinToken RunMode:%s", beego.BConfig.RunMode) globals.SugarLogger.Debugf("RefreshWeixinToken RunMode:%s", beego.BConfig.RunMode)
if globals.IsMainProductEnv() { if globals.IsMainProductEnv() {
if tokenInfo, err := api.WeixinAPI.CBRetrieveToken(); err == nil { if tokenInfo, err := api.WeixinAPI.CBRetrieveToken(); err == nil {
@@ -130,7 +130,7 @@ func RefreshWeixinToken() (err error) {
token = tokenInfo.Token token = tokenInfo.Token
} }
} }
return token, expireTimeStr return token, expireTimeStr, ""
}, func(value, v2 string) { }, func(value, v2 string) {
globals.SugarLogger.Debugf("RefreshWeixinToken setter value:%s", value) globals.SugarLogger.Debugf("RefreshWeixinToken setter value:%s", value)
syseventhub.SysEventHub.OnNewWXToken(value) syseventhub.SysEventHub.OnNewWXToken(value)
@@ -142,11 +142,9 @@ func RefreshWeixinToken() (err error) {
func RefreshFnToken() (err error) { func RefreshFnToken() (err error) {
if api.FnAPI != nil { if api.FnAPI != nil {
globals.SugarLogger.Debugf("=================初始化accesstoken") err = RefreshConfig("fn", fnTokenExpires, func() (token string, expireTimeStr string, refreshToken string) {
err = RefreshConfig("fn", fnTokenExpires, func() (token string, expireTimeStr string) {
globals.SugarLogger.Debugf("RefreshFnToken RunMode:%s", beego.BConfig.RunMode) globals.SugarLogger.Debugf("RefreshFnToken RunMode:%s", beego.BConfig.RunMode)
//if globals.IsMainProductEnv() { //if globals.IsMainProductEnv() {
globals.SugarLogger.Debugf("11====================111")
var refeshToken string var refeshToken string
curConfig := &legacymodel.Config{ curConfig := &legacymodel.Config{
Thirdparty: "fn", Thirdparty: "fn",
@@ -154,8 +152,6 @@ func RefreshFnToken() (err error) {
if err := orm.NewOrm().Read(curConfig, "Thirdparty"); err != nil { if err := orm.NewOrm().Read(curConfig, "Thirdparty"); err != nil {
globals.SugarLogger.Errorf("RefreshFnToken RefreshToken failed with error:%v", err) globals.SugarLogger.Errorf("RefreshFnToken RefreshToken failed with error:%v", err)
} }
fmt.Println("oldToken==============", curConfig.Token)
fmt.Println("oldToken==============", curConfig.RefreshToken)
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 { if tokenInfo, err := api.FnAPI.GetAccessToken(); err == nil {
@@ -165,27 +161,22 @@ func RefreshFnToken() (err error) {
} else { } else {
globals.SugarLogger.Errorf("RefreshFnToken RefreshToken failed with error:%v", err) globals.SugarLogger.Errorf("RefreshFnToken RefreshToken failed with error:%v", err)
} }
sql := `
UPDATE config SET token = ?,refresh_token = ? WHERE thirdparty = ? sql := `UPDATE config SET token = ?,refresh_token = ? WHERE thirdparty = ?`
` dao.ExecuteSQL(dao.GetDB(), sql, []interface{}{
sqlParams := []interface{}{
token, refeshToken, "fn", token, refeshToken, "fn",
} })
dao.ExecuteSQL(dao.GetDB(), sql, sqlParams)
//} //}
if beego.BConfig.RunMode == "jxgy" { if beego.BConfig.RunMode == "jxgy" {
config := &legacymodel.Config{} config := &legacymodel.Config{}
sql := ` sql := `SELECT * FROM config WHERE thirdparty = 'fn'`
SELECT * FROM config WHERE thirdparty = 'fn'
`
if err := dao.GetRow(dao.GetDB(), &config, sql, nil); err == nil { if err := dao.GetRow(dao.GetDB(), &config, sql, nil); err == nil {
token = config.Token token = config.Token
} }
} }
return token, expireTimeStr return token, expireTimeStr, refreshToken
}, func(value, v2 string) { }, func(value, v2 string) {
globals.SugarLogger.Debugf("RefreshFnToken setter value:%s", value) globals.SugarLogger.Debugf("RefreshFnToken setter value:%s", value)
// syseventhub.SysEventHub.OnNewWXToken(value)
api.FnAPI.SetToken(value) api.FnAPI.SetToken(value)
api.FnAPI.SetRefreshToken(value) api.FnAPI.SetRefreshToken(value)
}) })
@@ -195,7 +186,7 @@ func RefreshFnToken() (err error) {
func RefreshQywxToken() (err error) { func RefreshQywxToken() (err error) {
if api.QywxAPI != nil { if api.QywxAPI != nil {
err = RefreshConfig("qywx", weixinTokenExpires, func() (token string, expireTimeStr string) { err = RefreshConfig("qywx", weixinTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) {
globals.SugarLogger.Debugf("RefreshQywxToken RunMode:%s", beego.BConfig.RunMode) globals.SugarLogger.Debugf("RefreshQywxToken RunMode:%s", beego.BConfig.RunMode)
if globals.IsMainProductEnv() { if globals.IsMainProductEnv() {
if tokenInfo, err := api.QywxAPI.GetToken(); err == nil { if tokenInfo, err := api.QywxAPI.GetToken(); err == nil {
@@ -205,7 +196,7 @@ func RefreshQywxToken() (err error) {
globals.SugarLogger.Errorf("RefreshQywxToken RefreshToken failed with error:%v", err) globals.SugarLogger.Errorf("RefreshQywxToken RefreshToken failed with error:%v", err)
} }
} }
return token, expireTimeStr return token, expireTimeStr, ""
}, func(value, v2 string) { }, func(value, v2 string) {
globals.SugarLogger.Debugf("RefreshQywxToken setter value:%s", value) globals.SugarLogger.Debugf("RefreshQywxToken setter value:%s", value)
api.QywxAPI.SetToken(value) api.QywxAPI.SetToken(value)
@@ -216,7 +207,7 @@ func RefreshQywxToken() (err error) {
func RefreshWeixin2Token() (err error) { func RefreshWeixin2Token() (err error) {
if api.WeixinMiniAPI2 != nil { if api.WeixinMiniAPI2 != nil {
err = RefreshConfig("wechat2", weixinTokenExpires, func() (token string, expireTimeStr string) { err = RefreshConfig("wechat2", weixinTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) {
globals.SugarLogger.Debugf("RefreshWeixin2Token RunMode:%s", beego.BConfig.RunMode) globals.SugarLogger.Debugf("RefreshWeixin2Token RunMode:%s", beego.BConfig.RunMode)
if globals.IsMainProductEnv() { if globals.IsMainProductEnv() {
if tokenInfo, err := api.WeixinMiniAPI2.CBRetrieveToken(); err == nil { if tokenInfo, err := api.WeixinMiniAPI2.CBRetrieveToken(); err == nil {
@@ -231,7 +222,7 @@ func RefreshWeixin2Token() (err error) {
token = tokenInfo.Token token = tokenInfo.Token
} }
} }
return token, expireTimeStr return token, expireTimeStr, ""
}, func(value, v2 string) { }, func(value, v2 string) {
globals.SugarLogger.Debugf("RefreshWeixinToken setter value:%s", value) globals.SugarLogger.Debugf("RefreshWeixinToken setter value:%s", value)
syseventhub.SysEventHub.OnNewWX2Token(value) syseventhub.SysEventHub.OnNewWX2Token(value)
@@ -243,7 +234,7 @@ func RefreshWeixin2Token() (err error) {
func RefreshPushToken() (err error) { func RefreshPushToken() (err error) {
if api.PushAPI != nil { if api.PushAPI != nil {
err = RefreshConfig("push", pushTokenExpires, func() (token string, expireTimeStr string) { err = RefreshConfig("push", pushTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) {
globals.SugarLogger.Debugf("RefreshPushToken RunMode:%s", beego.BConfig.RunMode) globals.SugarLogger.Debugf("RefreshPushToken RunMode:%s", beego.BConfig.RunMode)
if globals.IsMainProductEnv() { if globals.IsMainProductEnv() {
if tokenInfo, err := api.PushAPI.CBRetrieveToken(); err == nil { if tokenInfo, err := api.PushAPI.CBRetrieveToken(); err == nil {
@@ -258,7 +249,7 @@ func RefreshPushToken() (err error) {
token = tokenInfo.Token token = tokenInfo.Token
} }
} }
return token, expireTimeStr return token, expireTimeStr, ""
}, func(value, v2 string) { }, func(value, v2 string) {
globals.SugarLogger.Debugf("RefreshPushToken setter value:%s", value) globals.SugarLogger.Debugf("RefreshPushToken setter value:%s", value)
syseventhub.SysEventHub.OnNewPushToken(value) syseventhub.SysEventHub.OnNewPushToken(value)
@@ -297,11 +288,11 @@ func RefreshWeixin3Token() (err error) {
func RefreshWeimobToken() (err error) { func RefreshWeimobToken() (err error) {
if api.WeimobAPI != nil { if api.WeimobAPI != nil {
err = RefreshConfig("weimob", weimobTokenExpires, func() (token string, expireTimeStr string) { err = RefreshConfig("weimob", weimobTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) {
globals.SugarLogger.Debugf("RefreshWeimobToken RunMode:%s", beego.BConfig.RunMode) globals.SugarLogger.Debugf("RefreshWeimobToken RunMode:%s", beego.BConfig.RunMode)
if globals.IsMainProductEnv() { if globals.IsMainProductEnv() {
if tokenInfo, err := api.WeimobAPI.RefreshTokenByRefreshToken(); err == nil { if tokenInfo, err := api.WeimobAPI.RefreshTokenByRefreshToken(); err == nil {
return string(utils.MustMarshal(tokenInfo)), utils.Time2Str(time.Now().Add((time.Duration(tokenInfo.ExpiresIn) - weimobTokenExpires/time.Second) * time.Second)) return string(utils.MustMarshal(tokenInfo)), utils.Time2Str(time.Now().Add((time.Duration(tokenInfo.ExpiresIn) - weimobTokenExpires/time.Second) * time.Second)), ""
} else { } else {
globals.SugarLogger.Debugf("RefreshWeimobToken err:%s", err) globals.SugarLogger.Debugf("RefreshWeimobToken err:%s", err)
} }
@@ -315,7 +306,7 @@ func RefreshWeimobToken() (err error) {
token = tokenInfo.Token token = tokenInfo.Token
} }
} }
return token, expireTimeStr return token, expireTimeStr, ""
}, func(value, v2 string) { }, func(value, v2 string) {
var tokenInfo *weimobapi.TokenInfo var tokenInfo *weimobapi.TokenInfo
err := utils.UnmarshalUseNumber([]byte(value), &tokenInfo) err := utils.UnmarshalUseNumber([]byte(value), &tokenInfo)
@@ -330,17 +321,17 @@ func RefreshWeimobToken() (err error) {
func RefreshDingDingToken() (err error) { func RefreshDingDingToken() (err error) {
api.DingDingAPI.RetrieveToken() api.DingDingAPI.RetrieveToken()
return RefreshConfig("dingding", dingdingTokenExpires, func() (string, string) { return RefreshConfig("dingding", dingdingTokenExpires, func() (string, string, string) {
globals.SugarLogger.Debugf("RefreshDingDingToken RunMode:%s", beego.BConfig.RunMode) globals.SugarLogger.Debugf("RefreshDingDingToken RunMode:%s", beego.BConfig.RunMode)
if true { //globals.IsProductEnv() { if true { //globals.IsProductEnv() {
if token, err := api.DingDingAPI.RetrieveToken(); err == nil { if token, err := api.DingDingAPI.RetrieveToken(); err == nil {
globals.SugarLogger.Debugf("RefreshDingDingToken tokenInfo:%s", token) globals.SugarLogger.Debugf("RefreshDingDingToken tokenInfo:%s", token)
return token, "" return token, "", ""
} else { } else {
globals.SugarLogger.Errorf("RefreshDingDingToken RefreshToken failed with error:%v", err) globals.SugarLogger.Errorf("RefreshDingDingToken RefreshToken failed with error:%v", err)
} }
} }
return "", "" return "", "", ""
}, func(value, v2 string) { }, func(value, v2 string) {
api.DingDingAPI.SetToken(value) api.DingDingAPI.SetToken(value)
}) })
@@ -358,7 +349,7 @@ func SaveWeimobToken(token *weimobapi.TokenInfo) (err error) {
} }
func RefreshYilianyunToken() (err error) { func RefreshYilianyunToken() (err error) {
return RefreshConfig("yilianyun", yilianyunTokenExpires, func() (token string, expireTimeStr string) { return RefreshConfig("yilianyun", yilianyunTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) {
globals.SugarLogger.Debugf("RefreshYilianyunToken RunMode:%s", beego.BConfig.RunMode) globals.SugarLogger.Debugf("RefreshYilianyunToken RunMode:%s", beego.BConfig.RunMode)
if globals.IsMainProductEnv() { // 只有京西菜市刷新易联云key if globals.IsMainProductEnv() { // 只有京西菜市刷新易联云key
if tokenInfo, err := api.YilianyunAPI.RetrieveToken(); err == nil { if tokenInfo, err := api.YilianyunAPI.RetrieveToken(); err == nil {
@@ -372,7 +363,7 @@ func RefreshYilianyunToken() (err error) {
token = tokenInfo.Token token = tokenInfo.Token
} }
} }
return token, expireTimeStr return token, expireTimeStr, ""
}, func(value, v2 string) { }, func(value, v2 string) {
token := value token := value
var tokenInfo *yilianyunapi.TokenInfo var tokenInfo *yilianyunapi.TokenInfo

8
conf/app.conf
View File

@@ -188,7 +188,7 @@ dadaSourceID = "73753"
fnAppID = "6705486294797503379" fnAppID = "6705486294797503379"
fnAppSecret = "c1e6c280-e618-4103-9d0a-673bc54fb22e" fnAppSecret = "c1e6c280-e618-4103-9d0a-673bc54fb22e"
fnCode = "KnCNnKUkUn2YVMLLW3NyE7" fnCode = "gzz00zZ7UHSilv4TIFpci8"
fnMerchantId= "51658" fnMerchantId= "51658"
fnCallbackURL = "http://callback.jxc4.com/fn/msg" fnCallbackURL = "http://callback.jxc4.com/fn/msg"
@@ -305,7 +305,7 @@ pushMasterSecret= "dGZcR0XGGg7H5Pd7FR3n47"
fnAppID = "6705486294797503379" fnAppID = "6705486294797503379"
fnAppSecret = "c1e6c280-e618-4103-9d0a-673bc54fb22e" fnAppSecret = "c1e6c280-e618-4103-9d0a-673bc54fb22e"
fnCode = "KnCNnKUkUn2YVMLLW3NyE7" fnCode = "gzz00zZ7UHSilv4TIFpci8"
fnMerchantId= "51658" fnMerchantId= "51658"
fnCallbackURL = "http://callback.jxc4.com/fn/msg" fnCallbackURL = "http://callback.jxc4.com/fn/msg"
@@ -396,7 +396,7 @@ jdShopAppSecret2 = "71e1061ac2f246f6ac27efb900edba12"
fnAppID = "6a3e2073-1850-413b-9eb7-6c342ec36e1c" fnAppID = "6a3e2073-1850-413b-9eb7-6c342ec36e1c"
fnAppSecret = "a8248088-a742-4c33-a0db-03aeae00ca7d" fnAppSecret = "a8248088-a742-4c33-a0db-03aeae00ca7d"
fnMerchantId = "51658" fnMerchantId = "51658"
fnCode = "KnCNnKUkUn2YVMLLW3NyE7" fnCode = "gzz00zZ7UHSilv4TIFpci8"
fnCallbackURL = "http://callback-jxgy.jxc4.com/fn/msg" fnCallbackURL = "http://callback-jxgy.jxc4.com/fn/msg"
jxPrintAppID = "1000" jxPrintAppID = "1000"
@@ -572,7 +572,7 @@ pushMasterSecret= "dGZcR0XGGg7H5Pd7FR3n47"
fnAppID = "6705486294797503379" fnAppID = "6705486294797503379"
fnAppSecret = "c1e6c280-e618-4103-9d0a-673bc54fb22e" fnAppSecret = "c1e6c280-e618-4103-9d0a-673bc54fb22e"
fnCode = "KnCNnKUkUn2YVMLLW3NyE7" fnCode = "gzz00zZ7UHSilv4TIFpci8"
fnMerchantId= "51658" fnMerchantId= "51658"
fnCallbackURL = "http://callback.jxc4.com/fn/msg" fnCallbackURL = "http://callback.jxc4.com/fn/msg"