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

dingdan

Browse Source
This commit is contained in:
邹宗楠
2022-09-30 17:16:22 +08:00
parent e2b41bf9db
commit 97c092cd26
36 changed files with 1753 additions and 1895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxutils/jxutils.go
View File

@@ -220,9 +220,7 @@ func GetPossibleVendorIDFromAfsOrderID(afsOrderID string) (vendorID int) {
}
func ComposeUniversalOrderID(orderID string, vendorID int) string {
// return fmt.Sprintf("%s|%d", orderID, vendorID)
return orderID // 当前用长度就能区分，先不加上vendorID
// return orderID + utils.Int64ToStr(time.Now().Unix())
}
func GetUniversalOrderIDFromWaybill(bill *model.Waybill) string {

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

@@ -473,48 +473,48 @@ func getWeimobTokenFromRemote(oldToken string) (tokenInfo *syseventhub.TokenInfo
}
// RefreshTiktokToken 刷新抖店token
func RefreshTiktokToken() (err error) {
if api.TiktokStore != nil {
err = RefreshConfig("tiktok", tiktokTokenExpires, func() (token string, expireTimeStr string, refreshToken string) {
curConfig := &legacymodel.Config{
Thirdparty: "tiktok",
}
if err := orm.NewOrm().Read(curConfig, "Thirdparty"); err != nil {
globals.SugarLogger.Errorf("RefreshTiktokToken RefreshToken failed with error:%v", err)
}
if curConfig.RefreshToken == "" {
if tokenInfo, err := api.TiktokStore.CreateToken(curConfig.Token); err != nil {
globals.SugarLogger.Errorf("tiktok store get token err:%v", err)
} else {
token = tokenInfo.AccessToken
refreshToken = tokenInfo.RefreshToken
expireTimeStr = time.Unix(tokenInfo.ExpiresIn, 0).Format("2006-01-02 15:04:05")
}
} else {
expireIn, _ := time.Parse("2006-01-02 15:04:05", curConfig.Date)
if expireIn.Unix() < time.Now().Unix() {
api.TiktokStore.SetToken(curConfig.Token)
api.TiktokStore.SetRefreshToken(curConfig.RefreshToken)
if tokenInfo, err := api.TiktokStore.RefreshToken(); err == nil {
token = tokenInfo.AccessToken
refreshToken = tokenInfo.RefreshToken
expireTimeStr = time.Unix(tokenInfo.ExpiresIn, 0).Format("2006-01-02 15:04:05")
} else {
globals.SugarLogger.Errorf("RefreshTiktokToken RefreshToken failed with error:%v", err)
}
}
}
sql := `UPDATE config SET token = ?,refresh_token = ?,data = ? WHERE thirdparty = ?`
dao.ExecuteSQL(dao.GetDB(), sql, []interface{}{
token, refreshToken, expireTimeStr, "tiktok",
})
return token, expireTimeStr, refreshToken
}, func(value, v2 string) {
globals.SugarLogger.Debugf("RefreshFnToken setter value:[%s],[%s]", value, v2)
api.TiktokStore.SetToken(value)
api.TiktokStore.SetRefreshToken(v2)
})
}
return err
}
//func RefreshTiktokToken() (err error) {
// if api.TiktokStore != nil {
// err = RefreshConfig("tiktok", tiktokTokenExpires, func() (token string, expireTimeStr string, refreshToken string) {
// curConfig := &legacymodel.Config{
// Thirdparty: "tiktok",
// }
// if err := orm.NewOrm().Read(curConfig, "Thirdparty"); err != nil {
// globals.SugarLogger.Errorf("RefreshTiktokToken RefreshToken failed with error:%v", err)
// }
// if curConfig.RefreshToken == "" {
// if tokenInfo, err := api.TiktokStore.CreateToken(curConfig.Token); err != nil {
// globals.SugarLogger.Errorf("tiktok store get token err:%v", err)
// } else {
// token = tokenInfo.AccessToken
// refreshToken = tokenInfo.RefreshToken
// expireTimeStr = time.Unix(tokenInfo.ExpiresIn, 0).Format("2006-01-02 15:04:05")
// }
// } else {
// expireIn, _ := time.Parse("2006-01-02 15:04:05", curConfig.Date)
// if expireIn.Unix() < time.Now().Unix() {
// api.TiktokStore.SetToken(curConfig.Token)
// api.TiktokStore.SetRefreshToken(curConfig.RefreshToken)
// if tokenInfo, err := api.TiktokStore.RefreshToken(); err == nil {
// token = tokenInfo.AccessToken
// refreshToken = tokenInfo.RefreshToken
// expireTimeStr = time.Unix(tokenInfo.ExpiresIn, 0).Format("2006-01-02 15:04:05")
// } else {
// globals.SugarLogger.Errorf("RefreshTiktokToken RefreshToken failed with error:%v", err)
// }
// }
// }
//
// sql := `UPDATE config SET token = ?,refresh_token = ?,data = ? WHERE thirdparty = ?`
// dao.ExecuteSQL(dao.GetDB(), sql, []interface{}{
// token, refreshToken, expireTimeStr, "tiktok",
// })
// return token, expireTimeStr, refreshToken
// }, func(value, v2 string) {
// globals.SugarLogger.Debugf("RefreshFnToken setter value:[%s],[%s]", value, v2)
// api.TiktokStore.SetToken(value)
// api.TiktokStore.SetRefreshToken(v2)
// })
// }
// return err
//}