diff --git a/business/jxutils/tasks/configrefresh.go b/business/jxutils/tasks/configrefresh.go index 8ee90c46a..1749cb265 100644 --- a/business/jxutils/tasks/configrefresh.go +++ b/business/jxutils/tasks/configrefresh.go @@ -145,7 +145,6 @@ func RefreshFnToken() (err error) { err = RefreshConfig("fn", fnTokenExpires, func() (token string, expireTimeStr string, refreshToken string) { globals.SugarLogger.Debugf("RefreshFnToken RunMode:%s", beego.BConfig.RunMode) //if globals.IsMainProductEnv() { - var refeshToken string curConfig := &legacymodel.Config{ Thirdparty: "fn", } @@ -157,14 +156,14 @@ func RefreshFnToken() (err error) { if tokenInfo, err := api.FnAPI.GetAccessToken(); err == nil { globals.SugarLogger.Debugf("RefreshFnToken tokenInfo:%s", utils.Format4Output(tokenInfo, true)) token = tokenInfo.BusinessDataObj.AccessToken - refeshToken = tokenInfo.BusinessDataObj.RefreshToken + 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, refeshToken, "fn", + token, refreshToken, "fn", }) //} if beego.BConfig.RunMode == "jxgy" { @@ -176,9 +175,9 @@ func RefreshFnToken() (err error) { } return token, expireTimeStr, refreshToken }, func(value, v2 string) { - globals.SugarLogger.Debugf("RefreshFnToken setter value:%s", value) + globals.SugarLogger.Debugf("RefreshFnToken setter value:[%s],[%s]", value, v2) api.FnAPI.SetToken(value) - api.FnAPI.SetRefreshToken(value) + api.FnAPI.SetRefreshToken(v2) }) } return err diff --git a/conf/app.conf b/conf/app.conf index 3690b366d..92ae6b3c0 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -188,7 +188,7 @@ dadaSourceID = "73753" fnAppID = "6705486294797503379" fnAppSecret = "c1e6c280-e618-4103-9d0a-673bc54fb22e" -fnCode = "gzz00zZ7UHSilv4TIFpci8" +fnCode = "EbCkMP8karmW8o7xkOGu6Q" fnMerchantId= "51658" fnCallbackURL = "http://callback.jxc4.com/fn/msg" @@ -305,7 +305,7 @@ pushMasterSecret= "dGZcR0XGGg7H5Pd7FR3n47" fnAppID = "6705486294797503379" fnAppSecret = "c1e6c280-e618-4103-9d0a-673bc54fb22e" -fnCode = "gzz00zZ7UHSilv4TIFpci8" +fnCode = "EbCkMP8karmW8o7xkOGu6Q" fnMerchantId= "51658" fnCallbackURL = "http://callback.jxc4.com/fn/msg" @@ -396,7 +396,7 @@ jdShopAppSecret2 = "71e1061ac2f246f6ac27efb900edba12" fnAppID = "6a3e2073-1850-413b-9eb7-6c342ec36e1c" fnAppSecret = "a8248088-a742-4c33-a0db-03aeae00ca7d" fnMerchantId = "51658" -fnCode = "gzz00zZ7UHSilv4TIFpci8" +fnCode = "EbCkMP8karmW8o7xkOGu6Q" fnCallbackURL = "http://callback-jxgy.jxc4.com/fn/msg" jxPrintAppID = "1000" @@ -572,7 +572,7 @@ pushMasterSecret= "dGZcR0XGGg7H5Pd7FR3n47" fnAppID = "6705486294797503379" fnAppSecret = "c1e6c280-e618-4103-9d0a-673bc54fb22e" -fnCode = "gzz00zZ7UHSilv4TIFpci8" +fnCode = "EbCkMP8karmW8o7xkOGu6Q" fnMerchantId= "51658" fnCallbackURL = "http://callback.jxc4.com/fn/msg"