From 26fd50e72621236751d6bc3d88c1045e6a72a634 Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Fri, 19 Nov 2021 20:54:29 +0800
Subject: [PATCH] =?UTF-8?q?[Fix]=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |  1 -
 app/build.gradle                              |  1 +
 .../com/mogo/cloud/ConfigInfoActivity.java    |  1 +
 .../mogo/cloud/LivePlayAndPushActivity.java   |  2 +-
 .../java/com/mogo/cloud/MainActivity.java     |  2 +-
 .../java/com/mogo/cloud/RealTimeActivity.java |  2 +-
 .../location/MogoLocationInfoServices.java    |  2 +-
 .../cloud/wifi/WifiBroadCastReceiver.java     |  3 ++-
 foudations/mogo-live/build.gradle             |  1 +
 .../live/manager/CameraStatusManager.java     |  8 ++------
 .../live/manager/LiveStreamManagerImpl.java   |  2 +-
 .../live/manager/RequestLiveManager.java      |  6 +++---
 .../mogo/cloud/live/server/PushService.java   |  2 +-
 .../cloud/live/socket/SocketRequestUtils.java |  2 +-
 foudations/mogo-location/build.gradle         |  4 +---
 .../location/third/ThirdLocationManager.java  |  2 +-
 .../third/core/LocationDelegateManager.java   |  2 +-
 .../third/service/SocketRequestUtil.java      |  2 +-
 .../third/service/UploadDataService.java      |  2 +-
 foudations/mogo-network/build.gradle          |  1 +
 .../network/interceptor/HttpDnsInterceptor.kt |  5 +++--
 .../interceptor/HttpLoggingInterceptor.kt     |  2 +-
 .../interceptor/HttpPassportInterceptor.kt    | 20 ++++++++++---------
 foudations/mogo-passport/build.gradle         |  3 +--
 .../cloud/passport/MoGoAiCloudClient.java     |  4 ++--
 .../passport/MoGoAiCloudClientConfig.java     |  2 +-
 .../com/mogo/cloud/passport/SpStorage.java    |  3 ++-
 .../internal/InternalPassportManager.java     |  4 ++--
 foudations/mogo-socket/build.gradle           |  3 +--
 .../com/mogo/cloud/socket/SocketManager.java  |  4 ++--
 .../internal/InternalSocketManager.java       |  2 +-
 .../socket/third/ThirdSocketManager.java      |  2 +-
 .../socket/third/core/CallbackManager.java    |  3 ++-
 .../third/core/ConnCallbackManager.java       |  3 ++-
 .../cloud/socket/third/core/SocketClient.java |  2 +-
 .../cloud/socket/third/core/SocketConfig.java |  2 +-
 .../core/client/ClientChannelReader.java      |  2 +-
 .../core/client/ClientSocketManager.java      |  2 +-
 .../third/core/client/ConnectionWatchdog.java |  2 +-
 .../core/client/HeartbeatAlarmManager.java    |  4 ++--
 .../core/network/model/SocketSendData.java    |  2 +-
 .../cloud/socket/third/utils/RequestUtil.java |  6 +++---
 gradle.properties                             |  3 ++-
 modules.txt                                   |  1 -
 modules/mogo-realtime/build.gradle            |  1 +
 .../realtime/core/UploadInTimeHandler.java    |  4 ++--
 .../mogo/realtime/socket/SocketHandler.java   |  2 +-
 modules/mogo-tanlu/build.gradle               |  1 +
 .../tanlu/api/MogoRoadSearchManager.java      |  4 ++--
 modules/mogo-trafficlive/build.gradle         |  1 +
 .../api/MoGoAiCloudTrafficLive.java           |  2 +-
 .../core/TrafficLiveCurrentManager.java       |  2 +-
 settings.gradle                               |  1 -
 53 files changed, 78 insertions(+), 74 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0ff40e9..5da1e76 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -18,7 +18,6 @@
             <option value="$PROJECT_DIR$/foudations/mogo-network" />
             <option value="$PROJECT_DIR$/foudations/mogo-passport" />
             <option value="$PROJECT_DIR$/foudations/mogo-socket" />
-            <option value="$PROJECT_DIR$/foudations/mogo-utils" />
             <option value="$PROJECT_DIR$/modules" />
             <option value="$PROJECT_DIR$/modules/mogo-realtime" />
             <option value="$PROJECT_DIR$/modules/mogo-tanlu" />
diff --git a/app/build.gradle b/app/build.gradle
index de84c76..3a9e785 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,6 +55,7 @@ dependencies {
     implementation rootProject.ext.dependencies.rxandroid
     // 从车机获取视频流
     implementation 'com.zhidao.carmanager:common:1.0.25@aar'
+    implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}"
 
     if (Boolean.valueOf(RELEASE)) {
         implementation "com.mogo.cloud:location:${MOGO_LOCATION_VERSION}"
diff --git a/app/src/main/java/com/mogo/cloud/ConfigInfoActivity.java b/app/src/main/java/com/mogo/cloud/ConfigInfoActivity.java
index bfa3f58..748e43b 100644
--- a/app/src/main/java/com/mogo/cloud/ConfigInfoActivity.java
+++ b/app/src/main/java/com/mogo/cloud/ConfigInfoActivity.java
@@ -7,6 +7,7 @@ import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.elegant.network.utils.GsonUtil;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 
 /**
diff --git a/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java b/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java
index 18c0a6d..ccdb9ab 100644
--- a/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java
+++ b/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java
@@ -10,8 +10,8 @@ import com.mogo.cloud.live.manager.LiveStreamManagerImpl;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.cloud.trafficlive.api.ITrafficCarLiveCallBack;
 import com.mogo.cloud.trafficlive.api.MoGoAiCloudTrafficLive;
-import com.mogo.cloud.utils.logger.Logger;
 import com.mogo.cloud.wifi.IWifiStateListener;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 
 /**
diff --git a/app/src/main/java/com/mogo/cloud/MainActivity.java b/app/src/main/java/com/mogo/cloud/MainActivity.java
index 4b0882f..181d1e4 100644
--- a/app/src/main/java/com/mogo/cloud/MainActivity.java
+++ b/app/src/main/java/com/mogo/cloud/MainActivity.java
@@ -15,7 +15,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClient;
 import com.mogo.cloud.trafficlive.api.ITrafficCarLiveCallBack;
 import com.mogo.cloud.trafficlive.api.ITrafficIntersectionLiveCallBack;
 import com.mogo.cloud.trafficlive.api.MoGoAiCloudTrafficLive;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 public class MainActivity extends AppCompatActivity {
 
diff --git a/app/src/main/java/com/mogo/cloud/RealTimeActivity.java b/app/src/main/java/com/mogo/cloud/RealTimeActivity.java
index 86cd2bb..8417c61 100644
--- a/app/src/main/java/com/mogo/cloud/RealTimeActivity.java
+++ b/app/src/main/java/com/mogo/cloud/RealTimeActivity.java
@@ -6,11 +6,11 @@ import android.widget.Button;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.elegant.analytics.utils.Logger;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.realtime.api.MoGoAiCloudRealTime;
 import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
-import com.mogo.cloud.utils.logger.Logger;
 
 /**
  * @author liujing
diff --git a/app/src/main/java/com/mogo/cloud/location/MogoLocationInfoServices.java b/app/src/main/java/com/mogo/cloud/location/MogoLocationInfoServices.java
index 6d0e39f..dd8e6af 100644
--- a/app/src/main/java/com/mogo/cloud/location/MogoLocationInfoServices.java
+++ b/app/src/main/java/com/mogo/cloud/location/MogoLocationInfoServices.java
@@ -5,7 +5,7 @@ import android.content.Context;
 import androidx.annotation.Keep;
 
 import com.mogo.cloud.tanlu.bean.location.MogoLocation;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 @Keep
 public class MogoLocationInfoServices {
diff --git a/app/src/main/java/com/mogo/cloud/wifi/WifiBroadCastReceiver.java b/app/src/main/java/com/mogo/cloud/wifi/WifiBroadCastReceiver.java
index a62f8ce..be25ed0 100644
--- a/app/src/main/java/com/mogo/cloud/wifi/WifiBroadCastReceiver.java
+++ b/app/src/main/java/com/mogo/cloud/wifi/WifiBroadCastReceiver.java
@@ -6,7 +6,8 @@ import android.content.Intent;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 
-import com.mogo.cloud.utils.logger.Logger;
+import com.elegant.analytics.utils.Logger;
+
 
 public class WifiBroadCastReceiver extends BroadcastReceiver {
 
diff --git a/foudations/mogo-live/build.gradle b/foudations/mogo-live/build.gradle
index bcf8535..3c66a0f 100644
--- a/foudations/mogo-live/build.gradle
+++ b/foudations/mogo-live/build.gradle
@@ -50,6 +50,7 @@ dependencies {
     implementation 'com.google.protobuf:protobuf-java:3.12.4'
     implementation rootProject.ext.dependencies.rxjava
     implementation rootProject.ext.dependencies.rxandroid
+    implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}"
 
     if (Boolean.valueOf(RELEASE)) {
         api "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}"
diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/CameraStatusManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/CameraStatusManager.java
index 2499a24..276c97c 100644
--- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/CameraStatusManager.java
+++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/CameraStatusManager.java
@@ -1,17 +1,13 @@
 package com.mogo.cloud.live.manager;
 
-import com.google.gson.Gson;
-import com.mogo.cloud.GsonUtil;
+import com.elegant.network.utils.GsonUtil;
 import com.mogo.cloud.live.model.BaseData;
 import com.mogo.cloud.live.model.CameraStatusModel;
 import com.mogo.cloud.live.network.LiveApiServer;
 import com.mogo.cloud.network.NetConstants;
 import com.mogo.cloud.network.RetrofitFactory;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
-import com.mogo.cloud.utils.logger.Logger;
-
-import java.util.HashMap;
-import java.util.Map;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java
index eb5eee6..260084b 100644
--- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java
+++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java
@@ -12,7 +12,7 @@ import com.mogo.cloud.live.socket.SocketMsgUtils;
 import com.mogo.cloud.live.socket.SocketRequestUtils;
 import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener;
 import com.mogo.cloud.socket.entity.MsgBody;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 
 /**
diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java
index 0532c4d..ddbe19c 100644
--- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java
+++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java
@@ -1,5 +1,7 @@
 package com.mogo.cloud.live.manager;
 
+import static com.mogo.cloud.live.constant.LiveConstant.FRONT_CAMERA;
+
 import com.google.gson.Gson;
 import com.mogo.cloud.live.constant.LiveConstant;
 import com.mogo.cloud.live.listener.IRequestLiveListener;
@@ -12,7 +14,7 @@ import com.mogo.cloud.live.network.LiveApiServer;
 import com.mogo.cloud.network.NetConstants;
 import com.mogo.cloud.network.RetrofitFactory;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -23,8 +25,6 @@ import io.reactivex.annotations.NonNull;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 
-import static com.mogo.cloud.live.constant.LiveConstant.FRONT_CAMERA;
-
 
 /**
  * 请求直播管理类
diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/server/PushService.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/server/PushService.java
index acd7db6..0793744 100644
--- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/server/PushService.java
+++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/server/PushService.java
@@ -11,7 +11,7 @@ import com.mogo.cloud.live.listener.IYUVDataListener;
 import com.mogo.cloud.live.manager.CameraFrameManager;
 import com.mogo.cloud.live.manager.MoGoLiveManager;
 import com.mogo.cloud.live.utils.ByteUtils;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 
 public class PushService extends Service
diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/socket/SocketRequestUtils.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/socket/SocketRequestUtils.java
index 787aaf5..4d9e9ae 100644
--- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/socket/SocketRequestUtils.java
+++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/socket/SocketRequestUtils.java
@@ -1,6 +1,6 @@
 package com.mogo.cloud.live.socket;
 
-import com.mogo.cloud.TelephoneUtil;
+import com.mogo.eagle.core.utilcode.mogo.TelephoneUtil;
 import com.zhidao.ptech.shadow.server.protocol.DeviceInfo;
 
 public class SocketRequestUtils {
diff --git a/foudations/mogo-location/build.gradle b/foudations/mogo-location/build.gradle
index 8fc4d11..c37c7df 100644
--- a/foudations/mogo-location/build.gradle
+++ b/foudations/mogo-location/build.gradle
@@ -28,13 +28,11 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     api rootProject.ext.dependencies.spi
-
+    implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}"
     if (Boolean.valueOf(RELEASE)) {
-        implementation "com.mogo.cloud:utils:${MOGO_UTILS_VERSION}"
         implementation "com.mogo.cloud:passport:${MOGO_PASSPORT_VERSION}"
         implementation "com.mogo.cloud:socket:${MOGO_SOCKET_VERSION}"
     } else {
-        implementation project(":foudations:mogo-utils")
         implementation project(":foudations:mogo-passport")
         implementation project(":foudations:mogo-socket")
     }
diff --git a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/ThirdLocationManager.java b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/ThirdLocationManager.java
index 87c66dd..a22c08f 100644
--- a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/ThirdLocationManager.java
+++ b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/ThirdLocationManager.java
@@ -6,7 +6,7 @@ import com.mogo.cloud.location.third.core.LocUploadConfig;
 import com.mogo.cloud.location.third.core.LocUploadManager;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 public class ThirdLocationManager {
 
diff --git a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/core/LocationDelegateManager.java b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/core/LocationDelegateManager.java
index b5960ab..f3570eb 100644
--- a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/core/LocationDelegateManager.java
+++ b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/core/LocationDelegateManager.java
@@ -2,7 +2,7 @@ package com.mogo.cloud.location.third.core;
 
 import com.elegant.spi.AbstractDelegateManager;
 import com.elegant.spi.core.visitor.ServiceClassValue;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 public class LocationDelegateManager extends AbstractDelegateManager<LocationServiceProvider>
         implements AbstractDelegateManager.DelegateListener<Class<? extends LocationServiceProvider>> {
diff --git a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/SocketRequestUtil.java b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/SocketRequestUtil.java
index 85bf1b7..cf5903a 100644
--- a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/SocketRequestUtil.java
+++ b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/SocketRequestUtil.java
@@ -9,7 +9,7 @@ import com.mogo.cloud.location.third.core.LocationDelegateManager;
 import com.mogo.cloud.location.third.core.LocationServiceProvider;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.cloud.socket.third.core.SocketClient;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon;
 import com.zhidao.ptech.connsvr.payload.protocol.MogoPayload;
 import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;
diff --git a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/UploadDataService.java b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/UploadDataService.java
index c913985..da22a76 100644
--- a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/UploadDataService.java
+++ b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/UploadDataService.java
@@ -17,7 +17,7 @@ import com.mogo.cloud.location.third.core.LocUploadConfig;
 import com.mogo.cloud.socket.third.core.Callback;
 import com.mogo.cloud.socket.third.core.CallbackManager;
 import com.mogo.cloud.socket.third.core.SocketClient;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.zhidao.ptech.connsvr.payload.protocol.MogoPayload;
 import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;
 
diff --git a/foudations/mogo-network/build.gradle b/foudations/mogo-network/build.gradle
index 360cd04..d571657 100644
--- a/foudations/mogo-network/build.gradle
+++ b/foudations/mogo-network/build.gradle
@@ -55,6 +55,7 @@ dependencies {
     api rootProject.ext.dependencies.retrofitadapter
     api rootProject.ext.dependencies.retrofitconvertergson
     api rootProject.ext.dependencies.retrofitconverterscalars
+    implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}"
 
     if (Boolean.valueOf(RELEASE)) {
         api "com.mogo.cloud:passport:${MOGO_PASSPORT_VERSION}"
diff --git a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpDnsInterceptor.kt b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpDnsInterceptor.kt
index b1cc00c..f5cb4f3 100644
--- a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpDnsInterceptor.kt
+++ b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpDnsInterceptor.kt
@@ -1,7 +1,7 @@
 package com.mogo.cloud.network.interceptor
 
 import com.mogo.cloud.httpdns.MogoHttpDnsClient
-import com.mogo.cloud.utils.logger.Logger
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
@@ -22,7 +22,8 @@ class HttpDnsInterceptor : Interceptor {
                 Logger.d("DomainExchange", """oriHost: ${host}  newHost: $it  newUrl: $url""")
             }
         } catch (e: Exception) {
-            Logger.d("DomainExchange", e.toString())
+            e.printStackTrace()
+            Logger.e("DomainExchange", e.toString())
         }
         return chain.proceed(request.newBuilder().url(url).build())
     }
diff --git a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpLoggingInterceptor.kt b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpLoggingInterceptor.kt
index 5e18166..3365703 100644
--- a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpLoggingInterceptor.kt
+++ b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpLoggingInterceptor.kt
@@ -1,7 +1,7 @@
 package com.mogo.cloud.network.interceptor
 
 import com.mogo.cloud.network.NetConstants.Companion.TAG
-import com.mogo.cloud.utils.logger.Logger
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import okhttp3.*
 import okio.Buffer
 import java.io.IOException
diff --git a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpPassportInterceptor.kt b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpPassportInterceptor.kt
index b741c0b..9070665 100644
--- a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpPassportInterceptor.kt
+++ b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpPassportInterceptor.kt
@@ -2,8 +2,8 @@ package com.mogo.cloud.network.interceptor
 
 import com.mogo.cloud.network.BaseData
 import com.mogo.cloud.passport.MoGoAiCloudClient
-import com.mogo.cloud.GsonUtil
-import com.mogo.cloud.utils.logger.Logger
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger
+import com.mogo.eagle.core.utilcode.util.GsonUtils
 import okhttp3.Interceptor
 import okhttp3.MediaType
 import okhttp3.Response
@@ -29,19 +29,21 @@ class HttpPassportInterceptor : Interceptor {
             bodySize = if (contentLength != -1L) "$contentLength-byte" else "unknown-length"
             contentType = responseBody.contentType()
             responseContent = responseBody.string()
-            val response: BaseData<*>? = GsonUtil.objectFromJson(responseContent, BaseData::class.java)
+            val response: BaseData<*>? = GsonUtils.fromJson(responseContent, BaseData::class.java)
             // 处理Token异常
             if (response?.code == 100046 ||
-                    response?.code == 100045 ||
-                    response?.code == 100005 ||
-                    response?.code == 100006 ||
-                    response?.code == 520003) {
-                Logger.d("HttpPassportInterceptor", "Token 异常：$response")
+                response?.code == 100045 ||
+                response?.code == 100005 ||
+                response?.code == 100006 ||
+                response?.code == 520003
+            ) {
+                Logger.e("HttpPassportInterceptor", "Token 异常：$response")
                 MoGoAiCloudClient.getInstance().refreshToken()
             }
             consumedResponse = true
         }
-        return if (consumedResponse) response.newBuilder().body(ResponseBody.create(contentType, responseContent)).build() else response
+        return if (consumedResponse) response.newBuilder()
+            .body(ResponseBody.create(contentType, responseContent)).build() else response
 
     }
 }
\ No newline at end of file
diff --git a/foudations/mogo-passport/build.gradle b/foudations/mogo-passport/build.gradle
index 4e33a77..7dfec18 100644
--- a/foudations/mogo-passport/build.gradle
+++ b/foudations/mogo-passport/build.gradle
@@ -31,13 +31,12 @@ dependencies {
     implementation 'com.zhidao.thirdlogin:third-login:1.0.2'
     // passport-for-internal 内部SDK版本
     implementation 'com.zhidao.accountservice:account-sdk:1.0.18'
+    implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}"
 
     if (Boolean.valueOf(RELEASE)) {
         api "com.mogo.cloud:httpdns:${MOGO_HTTPDNS_VERSION}"
-        api "com.mogo.cloud:utils:${MOGO_UTILS_VERSION}"
     } else {
         api project(':foudations:mogo-httpdns')
-        api project(':foudations:mogo-utils')
     }
 
 }
diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java
index 314dc88..71b810b 100644
--- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java
+++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java
@@ -8,8 +8,8 @@ import androidx.annotation.Keep;
 
 import com.mogo.cloud.httpdns.MogoHttpDnsClient;
 import com.mogo.cloud.httpdns.MogoHttpDnsConfig;
-import com.mogo.cloud.utils.logger.LogLevel;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java
index 5edfe9a..14dda9b 100644
--- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java
+++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java
@@ -4,7 +4,7 @@ import android.text.TextUtils;
 
 import com.mogo.cloud.httpdns.MogoHttpDnsConfig;
 import com.mogo.cloud.httpdns.listener.IHttpDnsCurrentLocation;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 /**
  * SDK 中的参数
diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/SpStorage.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/SpStorage.java
index 5f50d5d..7a694df 100644
--- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/SpStorage.java
+++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/SpStorage.java
@@ -1,6 +1,7 @@
 package com.mogo.cloud.passport;
 
-import com.mogo.cloud.storage.SharedPrefsMgr;
+
+import com.elegant.utils.storage.SharedPrefsMgr;
 
 /**
  * @author donghongyu
diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/internal/InternalPassportManager.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/internal/InternalPassportManager.java
index b0b5bac..d0c316c 100644
--- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/internal/InternalPassportManager.java
+++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/internal/InternalPassportManager.java
@@ -3,12 +3,12 @@ package com.mogo.cloud.passport.internal;
 import android.content.Context;
 import android.text.TextUtils;
 
-import com.mogo.cloud.DevicesUtils;
 import com.mogo.cloud.httpdns.MogoHttpDnsConfig;
 import com.mogo.cloud.passport.IPassport;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.DevicesUtils;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.zhidao.account.sdk.AccountClientManager;
 import com.zhidao.account.sdk.BusinessType;
 import com.zhidao.account.sdk.Environment;
diff --git a/foudations/mogo-socket/build.gradle b/foudations/mogo-socket/build.gradle
index 130705e..84631cc 100644
--- a/foudations/mogo-socket/build.gradle
+++ b/foudations/mogo-socket/build.gradle
@@ -38,13 +38,12 @@ dependencies {
 
     // 上报位置  http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=48956200
     implementation 'com.zhidao.locupload:loc-upload-sdk:1.2.0'
+    implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}"
 
     if (Boolean.valueOf(RELEASE)) {
         implementation "com.mogo.cloud:passport:${MOGO_PASSPORT_VERSION}"
-        implementation "com.mogo.cloud:utils:${MOGO_UTILS_VERSION}"
     } else {
         implementation project(path: ':foudations:mogo-passport')
-        implementation project(path: ':foudations:mogo-utils')
     }
 }
 
diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java
index bbf7147..354a934 100644
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java
@@ -7,9 +7,9 @@ import android.content.Context;
 
 import androidx.annotation.NonNull;
 
+import com.elegant.network.utils.GsonUtil;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
-import com.mogo.cloud.GsonUtil;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.cloud.socket.entity.MsgBody;
@@ -17,7 +17,7 @@ import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.cloud.socket.internal.InternalSocketManager;
 import com.mogo.cloud.socket.third.ThirdSocketManager;
 import com.mogo.cloud.socket.third.core.ConnectionLifecycleListener;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;
 
 import java.util.ArrayList;
diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/internal/InternalSocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/internal/InternalSocketManager.java
index 39ad166..4e818a0 100644
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/internal/InternalSocketManager.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/internal/InternalSocketManager.java
@@ -7,7 +7,7 @@ import android.text.TextUtils;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.cloud.socket.SocketManager;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon;
 import com.zhidao.socketsdk.manager.OnSocketAckCallback;
 import com.zhidao.socketsdk.manager.OnSocketReceiveCallback;
diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java
index 514389c..76e82f7 100644
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java
@@ -17,7 +17,7 @@ import com.mogo.cloud.socket.third.core.CallbackManager;
 import com.mogo.cloud.socket.third.core.ConnectionLifecycleListener;
 import com.mogo.cloud.socket.third.core.SocketClient;
 import com.mogo.cloud.socket.third.core.SocketConfig;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.zhidao.locupload.Platform;
 import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon;
 
diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/CallbackManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/CallbackManager.java
index 43b4650..b16847b 100644
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/CallbackManager.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/CallbackManager.java
@@ -3,7 +3,8 @@ package com.mogo.cloud.socket.third.core;
 import androidx.annotation.NonNull;
 import androidx.collection.ArraySet;
 
-import com.mogo.cloud.utils.logger.Logger;
+
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 import java.util.Set;
 
diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/ConnCallbackManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/ConnCallbackManager.java
index 755af1b..04b9880 100644
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/ConnCallbackManager.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/ConnCallbackManager.java
@@ -3,7 +3,8 @@ package com.mogo.cloud.socket.third.core;
 
 import androidx.collection.ArraySet;
 
-import com.mogo.cloud.utils.logger.Logger;
+
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 import java.util.Set;
 
diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketClient.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketClient.java
index 3e981b1..7535d9f 100644
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketClient.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketClient.java
@@ -11,7 +11,7 @@ import com.mogo.cloud.socket.third.core.client.ClientSocketManager;
 import com.mogo.cloud.socket.third.core.network.RequestManager;
 import com.mogo.cloud.socket.third.core.network.model.SocketAddressData;
 import com.mogo.cloud.socket.third.utils.RequestUtil;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon;
 import com.zhidao.ptech.connsvr.payload.protocol.MogoPayload;
 import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;
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..8f0e941 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
@@ -6,9 +6,9 @@ import static com.mogo.cloud.socket.third.core.SocketConstants.DEFAULT_AUTH_PUB_
 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;
+import com.zhidao.utils.common.TelephoneUtil;
 
 public class SocketConfig {
     public static final String PROTO_VERSION = "1.0.1";
diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientChannelReader.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientChannelReader.java
index b04a3e6..7959cfa 100644
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientChannelReader.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientChannelReader.java
@@ -11,7 +11,7 @@ import com.mogo.cloud.socket.third.core.SocketConstants;
 import com.mogo.cloud.socket.third.utils.LoginStatusUtil;
 import com.mogo.cloud.socket.third.utils.RSAUtils;
 import com.mogo.cloud.socket.third.utils.RequestUtil;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;
 import com.zhidao.ptech.connsvr.protocol.model.MogoConnsvrPacket;
 
diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientSocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientSocketManager.java
index a700cb7..b444dfb 100644
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientSocketManager.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientSocketManager.java
@@ -4,7 +4,7 @@ import com.mogo.cloud.socket.third.core.ConnectionLifecycleListener;
 import com.mogo.cloud.socket.third.core.SocketConstants;
 import com.mogo.cloud.socket.third.utils.LoginStatusUtil;
 import com.mogo.cloud.socket.third.utils.RequestUtil;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.zhidao.ptech.connsvr.protocol.codec.MogoPacketDecoder;
 import com.zhidao.ptech.connsvr.protocol.codec.MogoPacketFrameDecoder;
 import com.zhidao.ptech.connsvr.protocol.codec.MogoPacketFrameEncoder;
diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ConnectionWatchdog.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ConnectionWatchdog.java
index ea2ecaa..8cd8653 100644
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ConnectionWatchdog.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ConnectionWatchdog.java
@@ -3,7 +3,7 @@ package com.mogo.cloud.socket.third.core.client;
 import com.mogo.cloud.socket.third.analytics.EventRequest;
 import com.mogo.cloud.socket.third.analytics.SocketStatus;
 import com.mogo.cloud.socket.third.core.SocketConstants;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/HeartbeatAlarmManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/HeartbeatAlarmManager.java
index 92defac..c83df17 100644
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/HeartbeatAlarmManager.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/HeartbeatAlarmManager.java
@@ -7,14 +7,14 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 
-import com.mogo.cloud.DevicesUtils;
 import com.mogo.cloud.socket.third.analytics.EventRequest;
 import com.mogo.cloud.socket.third.analytics.SocketStatus;
 import com.mogo.cloud.socket.third.core.SocketConfig;
 import com.mogo.cloud.socket.third.core.SocketConstants;
 import com.mogo.cloud.socket.third.utils.LoginStatusUtil;
 import com.mogo.cloud.socket.third.utils.RequestUtil;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.DevicesUtils;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 /**
  * Send heartbeats according to network type to keep socket active as well as
diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/network/model/SocketSendData.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/network/model/SocketSendData.java
index e067c85..e871737 100644
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/network/model/SocketSendData.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/network/model/SocketSendData.java
@@ -1,6 +1,6 @@
 package com.mogo.cloud.socket.third.core.network.model;
 
-import com.mogo.cloud.GsonUtil;
+import com.elegant.network.utils.GsonUtil;
 
 import org.json.JSONObject;
 
diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/utils/RequestUtil.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/utils/RequestUtil.java
index 0a06699..cedae10 100644
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/utils/RequestUtil.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/utils/RequestUtil.java
@@ -3,15 +3,15 @@ package com.mogo.cloud.socket.third.utils;
 import android.os.Build;
 import android.text.TextUtils;
 
-import com.mogo.cloud.DevicesUtils;
-import com.mogo.cloud.TelephoneUtil;
 import com.mogo.cloud.socket.third.core.SocketConfig;
 import com.mogo.cloud.socket.third.core.SocketConstants;
 import com.mogo.cloud.socket.third.core.client.ClientSocketManager;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.DevicesUtils;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon;
 import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;
 import com.zhidao.ptech.connsvr.protocol.model.MogoConnsvrPacket;
+import com.zhidao.utils.common.TelephoneUtil;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
diff --git a/gradle.properties b/gradle.properties
index 7dea2a9..f0d443d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -33,7 +33,8 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
 USERNAME=xintai
 PASSWORD=xintai2018
 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本
-RELEASE=true
+RELEASE=false
+MOGO_CORE_UTILS_VERSION=0.0.25
 # AI CLOUD 云平台
 # 工具类
 MOGO_UTILS_VERSION=1.3.4
diff --git a/modules.txt b/modules.txt
index acbf72b..5dceef1 100644
--- a/modules.txt
+++ b/modules.txt
@@ -1,4 +1,3 @@
-:foudations:mogo-utils
 :foudations:mogo-httpdns
 :foudations:mogo-passport
 :foudations:mogo-network
diff --git a/modules/mogo-realtime/build.gradle b/modules/mogo-realtime/build.gradle
index 64e3611..8fac268 100644
--- a/modules/mogo-realtime/build.gradle
+++ b/modules/mogo-realtime/build.gradle
@@ -29,6 +29,7 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     api rootProject.ext.dependencies.spi
+    implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}"
 
     if (Boolean.valueOf(RELEASE)) {
         implementation "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}"
diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java
index fe8ef2c..519ca46 100644
--- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java
+++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java
@@ -4,12 +4,12 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Message;
 
-import com.mogo.cloud.utils.logger.Logger;
-
 import static com.mogo.realtime.constant.RealTimeConstant.TAG;
 
 import androidx.annotation.Keep;
 
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
+
 /**
  * AI云 实时上报数据频率处理类
  */
diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java
index 1b5c35d..702bc24 100644
--- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java
+++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java
@@ -11,7 +11,7 @@ import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener;
 import com.mogo.cloud.socket.SocketManager;
 import com.mogo.cloud.socket.entity.MsgBody;
 import com.mogo.cloud.socket.entity.SocketDownData;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.realtime.constant.RealTimeConstant;
 import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;
 
diff --git a/modules/mogo-tanlu/build.gradle b/modules/mogo-tanlu/build.gradle
index b681007..25fb1a2 100644
--- a/modules/mogo-tanlu/build.gradle
+++ b/modules/mogo-tanlu/build.gradle
@@ -36,6 +36,7 @@ dependencies {
         exclude group: 'com.zhidao.utils', module: 'utils'
     }
     implementation rootProject.ext.dependencies.videoprocessor
+    implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}"
 
     if (Boolean.valueOf(RELEASE)) {
         api "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}"
diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/api/MogoRoadSearchManager.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/api/MogoRoadSearchManager.java
index c307b2d..57998c2 100644
--- a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/api/MogoRoadSearchManager.java
+++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/api/MogoRoadSearchManager.java
@@ -11,7 +11,7 @@ import com.mogo.cloud.tanlu.bean.RoadInfoRequest;
 import com.mogo.cloud.tanlu.bean.RoadInfos;
 import com.mogo.cloud.tanlu.constant.HttpConstant;
 import com.mogo.cloud.tanlu.net.TanluApiService;
-import com.mogo.cloud.GsonUtil;
+import com.mogo.eagle.core.utilcode.util.GsonUtils;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -65,7 +65,7 @@ public class MogoRoadSearchManager {
     public void queryRoadInfo(RoadInfoRequest roadInfoRequest, IRoadInfoSearchCallback callback) {
         Map<String, Object> map = new HashMap<>();
         map.put("sn", MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getSn());
-        map.put("data", GsonUtil.jsonFromObject(roadInfoRequest));
+        map.put("data", GsonUtils.toJson(roadInfoRequest));
 
         apiService.queryRoadInfos(map)
                 .subscribeOn(Schedulers.io())
diff --git a/modules/mogo-trafficlive/build.gradle b/modules/mogo-trafficlive/build.gradle
index 9065f29..e901ffd 100644
--- a/modules/mogo-trafficlive/build.gradle
+++ b/modules/mogo-trafficlive/build.gradle
@@ -29,6 +29,7 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation rootProject.ext.dependencies.rxjava
     implementation rootProject.ext.dependencies.rxandroid
+    implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}"
 
     if (Boolean.valueOf(RELEASE)) {
         implementation "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}"
diff --git a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/MoGoAiCloudTrafficLive.java b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/MoGoAiCloudTrafficLive.java
index 38b7b93..7b6ece1 100644
--- a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/MoGoAiCloudTrafficLive.java
+++ b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/MoGoAiCloudTrafficLive.java
@@ -3,7 +3,7 @@ package com.mogo.cloud.trafficlive.api;
 import android.view.SurfaceView;
 
 import com.mogo.cloud.trafficlive.core.TrafficLiveCurrentManager;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 import static com.mogo.cloud.trafficlive.constant.TrafficLiveConstant.TAG;
 
diff --git a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java
index 7e3c2c2..f0086af 100644
--- a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java
+++ b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java
@@ -13,7 +13,7 @@ import com.mogo.cloud.live.manager.RequestLiveManager;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
 import com.mogo.cloud.trafficlive.api.ITrafficCarLiveCallBack;
 import com.mogo.cloud.trafficlive.api.ITrafficIntersectionLiveCallBack;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 import static com.mogo.cloud.live.constant.LiveConstant.LIVE_TYPE_CLOSE;
 import static com.mogo.cloud.live.constant.LiveConstant.LIVE_TYPE_OPEN;
diff --git a/settings.gradle b/settings.gradle
index 6252a8a..6925005 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,5 @@
 include ':foudations:mogo-location'
 include ':modules:mogo-trafficlive'
-include ':foudations:mogo-utils'
 include ':foudations:mogo-live'
 include ':foudations:mogo-socket'
 include ':modules:mogo-realtime'