diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginServiceManager.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginServiceManager.kt index 086f308d7d..b1169e28be 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginServiceManager.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginServiceManager.kt @@ -66,14 +66,14 @@ object LoginServiceManager : IOchLanPassengerStatusListener { if (oldValue != newValue) { OchChainLogManager.writeChainLog("登录状态变化", "${oldValue}-->${newValue}") Log.d(tag, "登录状态变化:${oldValue}-->${newValue}") - if (newValue == EnumLoginStatus.Login && AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { - BizLoopManager.setLoopFunction( - TAGLoopStatus, - LoopInfo(60 * 2, ::queryLoginStatusByNet, immediately = false, scheduler = Schedulers.io()) - ) - } else { - BizLoopManager.removeLoopFunction(TAGLoopStatus) - } +// if (newValue == EnumLoginStatus.Login && AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { +// BizLoopManager.setLoopFunction( +// TAGLoopStatus, +// LoopInfo(60 * 2, ::queryLoginStatusByNet, immediately = false, scheduler = Schedulers.io()) +// ) +// } else { +// BizLoopManager.removeLoopFunction(TAGLoopStatus) +// } LoginStatusManager.invokeLoginStatusChange(loginStatus) } } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/network/interceptor/FRetryWithTime.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/network/interceptor/FRetryWithTime.kt index afb02b452f..989d7d938c 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/network/interceptor/FRetryWithTime.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/network/interceptor/FRetryWithTime.kt @@ -15,7 +15,6 @@ class FRetryWithTime : Function> { override fun apply(baseData: T): ObservableSource { baseData.let { if (it.code == 100046 || it.code == 100045 || it.code == 100005 || it.code == 100006 || it.code == 520003) { - MoGoAiCloudClient.getInstance().refreshToken() return Observable.error(OchCommonRetryException()) }else if(it.code == 1003){ CallerLogger.e(M_OCHCOMMON, "接口失败报错 1003:需重新查询登录状态") diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/network/interceptor/RetryWithTime.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/network/interceptor/RetryWithTime.kt index 5c06544bc0..5bda2784a5 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/network/interceptor/RetryWithTime.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/network/interceptor/RetryWithTime.kt @@ -3,6 +3,7 @@ package com.mogo.och.common.module.network.interceptor import com.mogo.eagle.core.utilcode.constant.TimeConstants import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.TimeUtils +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.utils.CallerLoggerUtils.flavorTag import io.reactivex.Observable import io.reactivex.ObservableSource @@ -15,12 +16,13 @@ class RetryWithTime : Function, ObservableSource> { private const val TAG = "RetryWithTime" } var current = -1 - private var timeDelys = intArrayOf(3, 1, 2) + private var timeDelys = intArrayOf(6, 2, 4) override fun apply(throwableObservable: Observable): ObservableSource? { return throwableObservable.flatMap { ++current CallerLogger.e("${flavorTag}$TAG", " 时间:${TimeUtils.getStringByNow(0, TimeConstants.SEC)}") if (it is OchCommonRetryException && current < timeDelys.size) { + OchChainLogManager.writeChainLogError("token超时","${timeDelys[current]}s后重试") Observable.timer(timeDelys[current].toLong(), TimeUnit.SECONDS) } else { Observable.error(it) diff --git a/gradle.properties b/gradle.properties index afb0b58c88..4994878213 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,7 @@ LOGLIB_VERSION=1.10.18 # 网络请求LOGLIB_VERSION MOGO_NETWORK_VERSION=1.4.7.58 # 鉴权 -MOGO_PASSPORT_VERSION=1.4.7.58 +MOGO_PASSPORT_VERSION=1.4.7.63 # 长链接 MOGO_SOCKET_VERSION=1.4.7.58 # 数据采集