yangyakun921/MoGoAiCloudSdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix_log_print

Browse Source 
# Conflicts:
#	foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConfig.java
#	gradle.properties
This commit is contained in:
donghongyu
2021-11-19 21:32:31 +08:00
parent 26fd50e726 493da4d118
commit 7c453cb7ef
7 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConfig.java
View File

@@ -1,7 +1,6 @@
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;
@@ -139,11 +138,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;
}

2
foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConstants.java
View File

@@ -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";
}