diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/constant/URLConst.kt b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/constant/URLConst.kt
index c0ef94ad99..77e4edd6ad 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/constant/URLConst.kt
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/constant/URLConst.kt
@@ -1,24 +1,10 @@
 package com.mogo.och.bus.passenger.constant
 
-import com.mogo.commons.debug.DebugConfig
-import com.mogo.eagle.core.data.config.FunctionBuildConfig
-import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
-import com.mogo.och.common.module.biz.constant.OchCommonConst
-
 /**
  * Created on 2021/12/6
  */
 class URLConst {
     companion object {
 
-        @JvmStatic
-        fun getBaseUrl(): String {
-            return if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){
-                OchCommonConst.getShuttleUrl()
-            }else{
-                OchCommonConst.getBaseUrl()
-            }
-
-        }
     }
 }
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
index 1dc6d54e50..154cafb2b8 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
@@ -511,11 +511,7 @@ public class BusPassengerModel {
     }
 
     public int getAverageSpeed(){
-        if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){
-            return BusPassengerConst.SHUTTLE_AVERAGE_SPEED;
-        }else {
-            return BusPassengerConst.BUS_AVERAGE_SPEED;
-        }
+        return BusPassengerConst.BUS_AVERAGE_SPEED;
     }
 
     public void startRemainRouteInfo() {
diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
index 39a85aa57f..a09db90434 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
@@ -4,13 +4,10 @@ import android.content.Context
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.getServerToken
 import com.mogo.och.bus.passenger.bean.BusPassengerRoutesResponse
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
-import com.mogo.eagle.core.data.config.FunctionBuildConfig
-import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 import com.mogo.och.bus.passenger.bean.BusPassengerQueryLineRequest
 import com.mogo.och.bus.passenger.bean.BusPassengerOperationStatusResponse
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
-import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
-import com.mogo.och.bus.passenger.constant.URLConst.Companion.getBaseUrl
+import com.mogo.och.common.module.biz.constant.OchCommonConst
 import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
 import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl
 import com.mogo.och.common.module.biz.network.interceptor.transformTry
@@ -22,17 +19,15 @@ object BusPassengerServiceManager {
 
     private var driverSnCache = ""
 
-    private var mShuttleBusPassengerServiceApi =
-        MoGoRetrofitFactory.getInstance(getBaseUrl()).create(ShettlePassengerServiceApi::class.java)
     private var mBusPassengerServiceApi =
-        MoGoRetrofitFactory.getInstance(getBaseUrl()).create(PassengerServiceApi::class.java)
+        MoGoRetrofitFactory.getInstance(OchCommonConst.getBaseUrl()).create(PassengerServiceApi::class.java)
 
     /**
      * 获取Bus司机端的sn
      * @return
      */
     val driverAppSn: String
-        get(){
+        get() {
             val serverToken = getServerToken()
             if (serverToken != driverSnCache && serverToken.isNotEmpty()) {
                 driverSnCache = serverToken
@@ -49,25 +44,14 @@ object BusPassengerServiceManager {
     fun queryDriverSiteByCoordinate(
         context: Context, callback: OchCommonServiceCallback<BusPassengerRoutesResponse>?
     ) {
-        if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
-            mShuttleBusPassengerServiceApi.queryDriverSiteByCoordinate(
-                MoGoAiCloudClientConfig.getInstance().serviceAppId,
-                MoGoAiCloudClientConfig.getInstance().token,
-                BusPassengerQueryLineRequest(
-                    driverAppSn
-                )
-            ).transformTry()
-                .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate"))
-        } else {
-            mBusPassengerServiceApi.queryDriverSiteByCoordinate(
-                MoGoAiCloudClientConfig.getInstance().serviceAppId,
-                MoGoAiCloudClientConfig.getInstance().token,
-                BusPassengerQueryLineRequest(
-                    driverAppSn
-                )
-            ).transformTry()
-                .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate"))
-        }
+        mBusPassengerServiceApi.queryDriverSiteByCoordinate(
+            MoGoAiCloudClientConfig.getInstance().serviceAppId,
+            MoGoAiCloudClientConfig.getInstance().token,
+            BusPassengerQueryLineRequest(
+                driverAppSn
+            )
+        ).transformTry()
+            .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate"))
     }
 
     /**
@@ -80,22 +64,12 @@ object BusPassengerServiceManager {
         context: Context,
         callback: OchCommonServiceCallback<BusPassengerOperationStatusResponse>?
     ) {
-        if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
-            mShuttleBusPassengerServiceApi.queryDriverOperationStatus(
-                MoGoAiCloudClientConfig.getInstance().serviceAppId,
-                MoGoAiCloudClientConfig.getInstance().token,
-                driverAppSn
-            )
-                .transformTry()
-                .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus"))
-        } else {
-            mBusPassengerServiceApi.queryDriverOperationStatus(
-                MoGoAiCloudClientConfig.getInstance().serviceAppId,
-                MoGoAiCloudClientConfig.getInstance().token,
-                driverAppSn
-            )
-                .transformTry()
-                .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus"))
-        }
+        mBusPassengerServiceApi.queryDriverOperationStatus(
+            MoGoAiCloudClientConfig.getInstance().serviceAppId,
+            MoGoAiCloudClientConfig.getInstance().token,
+            driverAppSn
+        )
+            .transformTry()
+            .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus"))
     }
 }
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java
deleted file mode 100644
index c780786bf2..0000000000
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.mogo.och.bus.passenger.network;
-
-import com.mogo.och.bus.passenger.bean.BusPassengerOperationStatusResponse;
-import com.mogo.och.bus.passenger.bean.BusPassengerQueryLineRequest;
-import com.mogo.och.bus.passenger.bean.BusPassengerRoutesResponse;
-
-import io.reactivex.Observable;
-import retrofit2.http.Body;
-import retrofit2.http.GET;
-import retrofit2.http.Header;
-import retrofit2.http.Headers;
-import retrofit2.http.POST;
-import retrofit2.http.Query;
-
-/**
- * Created on 2022/3/31
- *
- * Bus乘客端接口定义
- */
-interface ShettlePassengerServiceApi {
-    /**
-     * 查询bus司机端绑定路线
-     * @return 接口返回数据
-     */
-    @Headers( {"Content-Type:application/json;charset=UTF-8"} )
-    @POST( "/och-shuttle-cabin/api/business/v1/passenger/lineDataWithDriver/query" )
-    Observable<BusPassengerRoutesResponse> queryDriverSiteByCoordinate(@Header("appId") String appId, @Header("ticket") String ticket, @Body BusPassengerQueryLineRequest request);
-
-    /**
-     * 查询司机端的登陆状态
-     * @param sn
-     * @return
-     */
-    @Headers({"Content-type:application/json;charset=UTF-8"})
-//    @GET("/autopilot-car-hailing/car/v2/driver/bus/passenger/takeOrderStatus/query")
-    @GET("/och-shuttle-cabin/api/business/v1/passenger/loginStatus")
-    Observable<BusPassengerOperationStatusResponse> queryDriverOperationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn);
-
-
-}