From 33d97832ace5c4a9a3b27cfa63ff6931f0cf7274 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 19 Nov 2021 21:23:41 +0800 Subject: [PATCH 1/3] replace auth --- .../com/mogo/cloud/socket/third/core/SocketConfig.java | 8 +------- .../com/mogo/cloud/socket/third/core/SocketConstants.java | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConfig.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConfig.java index df847ed..cd088f1 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConfig.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConfig.java @@ -1,13 +1,11 @@ package com.mogo.cloud.socket.third.core; import static com.mogo.cloud.socket.third.core.SocketConstants.DEFAULT_AUTH_ORIGIN_PUB_KEY; -import static com.mogo.cloud.socket.third.core.SocketConstants.DEFAULT_AUTH_PUB_KEY; import android.content.Context; import android.text.TextUtils; import com.mogo.cloud.TelephoneUtil; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon; public class SocketConfig { @@ -139,11 +137,7 @@ public class SocketConfig { public String getAuthPubKey() { if (TextUtils.isEmpty(authPubKey)) { - if (MoGoAiCloudClientConfig.getInstance().isUseOriginSocket()) { - authPubKey = DEFAULT_AUTH_ORIGIN_PUB_KEY; - } else { - authPubKey = DEFAULT_AUTH_PUB_KEY; - } + authPubKey = DEFAULT_AUTH_ORIGIN_PUB_KEY; } return authPubKey; } diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConstants.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConstants.java index 131e814..1cbb1a8 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConstants.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConstants.java @@ -17,8 +17,6 @@ public interface SocketConstants { /*unit is ms*/ long ONE_MINUTE = 60 * ONE_SECOND; - String DEFAULT_AUTH_PUB_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1En+aK8zhDRI2495gwmFYuIAHJxFV8MQuBWSY+xRJMtNq6UITx72NgfMWxmxzoxrvv6T1mb3HMVpIto1H3mliPg9LbZ48GAuDRWXHxLxNR69W45okhGAkDxU1GmlRPzEplwwfbar5Bdv3Bd24ABpGQhzozfEK5T5Ej9KrT/a7YwIDAQAB"; - String DEFAULT_AUTH_ORIGIN_PUB_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLe57ORPgOnBrcWmGac3esB4PtIyI0rAHiyk5QoCRTnTyanwWLfstu7mz2MSHD3YuveNWDiIY8vtRvFNE4M/yA7eb4Mct01VKhKFI/JqwyXgNaSh5YCfmv0vg9687c7IUjTEAg+ReC/bSLDqEB3a0vuP95Txtj9smMlx1e37XFYQIDAQAB"; } From 9e7ca17d176761d942c528b057e9a4edd62812c5 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 19 Nov 2021 21:26:19 +0800 Subject: [PATCH 2/3] update version --- gradle.properties | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7dea2a9..d6c1ab1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,22 +36,22 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.3.4 +MOGO_UTILS_VERSION=1.3.5 # 网络请求 -MOGO_NETWORK_VERSION=1.3.4 +MOGO_NETWORK_VERSION=1.3.5 # 网络DNS -MOGO_HTTPDNS_VERSION=1.3.4 +MOGO_HTTPDNS_VERSION=1.3.5 # 鉴权 -MOGO_PASSPORT_VERSION=1.3.4 +MOGO_PASSPORT_VERSION=1.3.5 # 常链接 -MOGO_SOCKET_VERSION=1.3.4 +MOGO_SOCKET_VERSION=1.3.5 # 数据采集 -MOGO_REALTIME_VERSION=1.3.4 +MOGO_REALTIME_VERSION=1.3.5 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.3.4 +MOGO_TANLU_VERSION=1.3.5 # 直播推流 -MOGO_LIVE_VERSION=1.3.4 +MOGO_LIVE_VERSION=1.3.5 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.3.4 +MOGO_TRAFFICLIVE_VERSION=1.3.5 # 定位服务 -MOGO_LOCATION_VERSION=1.3.4 +MOGO_LOCATION_VERSION=1.3.5 From 380c248ff46749a1868c1bd6bcf41109ea496baf Mon Sep 17 00:00:00 2001 From: donghongyu Date: Fri, 19 Nov 2021 21:28:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[Fix]=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=8D=9310?= =?UTF-8?q?=E4=B9=8B=E5=90=8ECleartext=20HTTP=20traffic=20to=20dzt.zhidaoz?= =?UTF-8?q?hixing.com=20not=20permitted=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 1 + app/src/main/AndroidManifest.xml | 1 + app/src/main/java/com/mogo/cloud/MoGoApplication.java | 2 +- app/src/main/res/xml/network_security_config.xml | 4 ++++ gradle.properties | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/xml/network_security_config.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 610ea89..537f4cb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -16,6 +16,7 @@ + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d35262..3b9d61f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" + android:networkSecurityConfig="@xml/network_security_config" android:theme="@style/AppTheme"> + + + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 7dea2a9..ce8028d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,7 +33,7 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -RELEASE=true +RELEASE=false # AI CLOUD 云平台 # 工具类 MOGO_UTILS_VERSION=1.3.4