From a9834dbaf533f14a37a68dea8192f8eae442bba4 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 1 Aug 2023 11:51:10 +0800 Subject: [PATCH] [3.4.0] fix bug of security key and socket ststus --- .../startup/stageone/HttpDnsStartUp.kt | 14 +++++++------- gradle.properties | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt index e9c8c11947..2b66eeb852 100644 --- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt +++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt @@ -253,11 +253,11 @@ class HttpDnsStartUp : AndroidStartup() { if (FunctionBuildConfig.isSecure) { context?.let { val authStatus = - SharedPrefsMgr.getInstance(it).getBoolean("passportAuth-${DebugConfig.getNetMode()}", false) + SharedPrefsMgr.getInstance(it).getBoolean("securityKey-${DebugConfig.getNetMode()}", false) if (authStatus) { // clientConfig设置auth值，并带入header clientConfig.authPubKey = SharedPrefsMgr.getInstance(it) - .getString("passportAuthKey-${DebugConfig.getNetMode()}", "") + .getString("securityKey-${DebugConfig.getNetMode()}", "") return@let } // 安全校验 @@ -271,15 +271,15 @@ class HttpDnsStartUp : AndroidStartup() { nodeAliasCode = CHAIN_CODE_CLOUD_PASSPORT_AUTH_OK, paramIndexes = [0] ) - override fun onSuccess(secretKey: String) { + override fun onSuccess(securityKey: String) { CallerLogger.d( "$M_MAIN$TAG", - "onSuccess secretKey:$secretKey , thread:${Thread.currentThread().name}" + "onSuccess securityKey:$securityKey , thread:${Thread.currentThread().name}" ) - clientConfig.authPubKey = secretKey + clientConfig.securityKey = securityKey SharedPrefsMgr.getInstance(it) - .putString("passportAuthKey-${DebugConfig.getNetMode()}", secretKey) - SharedPrefsMgr.getInstance(it).putBoolean("passportAuth-${DebugConfig.getNetMode()}", true) + .putString("securityKey-${DebugConfig.getNetMode()}", securityKey) + SharedPrefsMgr.getInstance(it).putBoolean("securityKey-${DebugConfig.getNetMode()}", true) } @ChainLog( diff --git a/gradle.properties b/gradle.properties index 893bf27e7d..d858587845 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,23 +66,23 @@ SERVICE_BIZ_VERSION=1.2.4 LOGLIB_VERSION=1.7.0 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION -MOGO_NETWORK_VERSION=1.4.7.11 +MOGO_NETWORK_VERSION=1.4.7.12 # 鉴权 -MOGO_PASSPORT_VERSION=1.4.7.11 +MOGO_PASSPORT_VERSION=1.4.7.12 # 常链接 -MOGO_SOCKET_VERSION=1.4.7.11 +MOGO_SOCKET_VERSION=1.4.7.12 # 数据采集 -MOGO_REALTIME_VERSION=1.4.7.11 +MOGO_REALTIME_VERSION=1.4.7.12 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.4.7.11 +MOGO_TANLU_VERSION=1.4.7.12 # 直播推流 -MOGO_LIVE_VERSION=1.4.7.11 +MOGO_LIVE_VERSION=1.4.7.12 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.4.7.11 +MOGO_TRAFFICLIVE_VERSION=1.4.7.12 # 定位服务 -MOGO_LOCATION_VERSION=1.4.7.11 +MOGO_LOCATION_VERSION=1.4.7.12 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.4.7.11 +MOGO_TELEMATIC_VERSION=1.4.7.12 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=2.14.1.5