From 2a6a914c4a15e0b2f215a8eb19f6ffe066f429fb Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 19 Jan 2023 16:12:58 +0800 Subject: [PATCH] =?UTF-8?q?[master=E5=B0=86DNS=E6=8B=A6=E6=88=AA=E5=99=A8?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=94=B9=E4=B8=BA=E8=AF=B7=E6=B1=82=E5=A4=B4?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E8=AF=B7=E6=B1=82eagle-dns=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E7=94=B1=E6=9C=8D=E5=8A=A1=E7=AB=AF=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=88=86=E5=8F=91=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/cloud/network/ApiService.java | 2 +- .../cloud/live/constant/LiveHostConst.java | 11 +++++++++ .../live/manager/RequestLiveManager.java | 3 ++- .../cloud/live/network/LiveApiServer.java | 10 ++++---- .../com/mogo/cloud/network/OkHttpFactory.kt | 1 - .../interceptor/HttpHeaderInterceptor.kt | 7 ++++++ .../cloud/passport/MoGoAiCloudClient.java | 24 +++++++++---------- .../java/com/mogo/v2x/config/V2XConfig.kt | 2 +- .../com/mogo/v2x/http/api/V2XApiService.kt | 2 +- gradle.properties | 24 +++++++++---------- 10 files changed, 52 insertions(+), 34 deletions(-) create mode 100644 foudations/mogo-live/src/main/java/com/mogo/cloud/live/constant/LiveHostConst.java diff --git a/app/src/main/java/com/mogo/cloud/network/ApiService.java b/app/src/main/java/com/mogo/cloud/network/ApiService.java index 087ddc7..b50f493 100644 --- a/app/src/main/java/com/mogo/cloud/network/ApiService.java +++ b/app/src/main/java/com/mogo/cloud/network/ApiService.java @@ -28,6 +28,6 @@ public interface ApiService { * @return */ @FormUrlEncoded - @POST("/yycp-realtimeLocations/vehicleTypeManage/car/queryVehicleType/v1") + @POST("eagle-eye-dns/yycp-realtimeLocations/vehicleTypeManage/car/queryVehicleType/v1") Observable> queryHelpSignal(@FieldMap Map param); } diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/constant/LiveHostConst.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/constant/LiveHostConst.java new file mode 100644 index 0000000..d8969fe --- /dev/null +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/constant/LiveHostConst.java @@ -0,0 +1,11 @@ +package com.mogo.cloud.live.constant; + +public class LiveHostConst { + + public static final String HOST_EAGLE_QA = "http://eagle-dns-qa.zhidaozhixing.com/"; + + public static String getEagleHost(){ + return HOST_EAGLE_QA; + } + +} 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 1159d09..535a68e 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 @@ -5,6 +5,7 @@ import static com.mogo.cloud.live.constant.LiveConstant.FRONT_CAMERA; import com.elegant.log.simplelog.Logger; import com.google.gson.Gson; import com.mogo.cloud.live.constant.LiveConstant; +import com.mogo.cloud.live.constant.LiveHostConst; import com.mogo.cloud.live.listener.IRequestLiveListener; import com.mogo.cloud.live.model.BaseData; import com.mogo.cloud.live.model.Camera; @@ -35,7 +36,7 @@ public class RequestLiveManager { private final LiveApiServer liveApiServer; private RequestLiveManager() { - liveApiServer = RetrofitFactory.INSTANCE.getInstance(NetConstants.DEVA_HOST) //todo 涉及直播接口 没有对HttpDNS进行配置 + liveApiServer = RetrofitFactory.INSTANCE.getInstance(LiveHostConst.getEagleHost()) .create(LiveApiServer.class); } diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/network/LiveApiServer.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/network/LiveApiServer.java index e36f5a4..1a3da28 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/network/LiveApiServer.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/network/LiveApiServer.java @@ -27,7 +27,7 @@ public interface LiveApiServer { * @return {@link BaseData} */ @FormUrlEncoded - @POST("/dataSave/integratedServices/app/push/no/livePushAndSwitch/v1") + @POST("eagle-eye-dns/dataSave/integratedServices/app/push/no/livePushAndSwitch/v1") Observable getDesignativeVehicleLive(@FieldMap Map designativeVehicleHeadLiveMap); /** @@ -37,7 +37,7 @@ public interface LiveApiServer { * @return {@link BaseData} */ @FormUrlEncoded - @POST("yycp-geo-fence-carService/front/car") + @POST("eagle-eye-dns/yycp-geo-fence-carService/front/car") Observable> getFrontVehicleLive(@FieldMap Map frontVehicleHeadLiveMap); /** @@ -47,7 +47,7 @@ public interface LiveApiServer { * @return {@link BaseData} */ @FormUrlEncoded - @POST("yycp-geo-fence-carService/front/crossing") + @POST("eagle-eye-dns/yycp-geo-fence-carService/front/crossing") Observable> getFrontIntersectionLive(@FieldMap Map frontIntersectionLiveMap); /** @@ -55,7 +55,7 @@ public interface LiveApiServer { * * @return {@link BaseData} */ - @GET("mec-etl-server/device/unit/camera/live") + @GET("eagle-eye-dns/mec-etl-server/device/unit/camera/live") Observable> getDesignativeIntersectionLive(@QueryMap Map parameters); /** @@ -63,6 +63,6 @@ public interface LiveApiServer { * * @return {@link BaseData} */ - @POST("alarm/car/video/reportCameraStatus") + @POST("eagle-eye-dns/alarm/car/video/reportCameraStatus") Observable reportCameraStatus(@Body RequestBody parameters); } diff --git a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/OkHttpFactory.kt b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/OkHttpFactory.kt index fbfe63c..b32b757 100644 --- a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/OkHttpFactory.kt +++ b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/OkHttpFactory.kt @@ -25,7 +25,6 @@ class OkHttpFactory private constructor() { OkHttpClient.Builder() .addNetworkInterceptor(HttpHeaderInterceptor()) .addNetworkInterceptor(HttpLoggingInterceptor()) - .addInterceptor(HttpDnsInterceptor()) .addInterceptor(HttpPassportInterceptor()) .sslSocketFactory(createSSLSocketFactory(), createTrustAllManager()) .hostnameVerifier(SSLSocketFactoryUtils.TrustAllHostnameVerifier()) diff --git a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpHeaderInterceptor.kt b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpHeaderInterceptor.kt index 1bd75dc..0fa08f2 100644 --- a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpHeaderInterceptor.kt +++ b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpHeaderInterceptor.kt @@ -1,5 +1,6 @@ package com.mogo.cloud.network.interceptor +import com.mogo.cloud.httpdns.MogoHttpDnsConfig import com.mogo.cloud.passport.MoGoAiCloudClient import okhttp3.Interceptor import okhttp3.Response @@ -13,8 +14,14 @@ class HttpHeaderInterceptor : Interceptor { val original = chain.request() val request = original.newBuilder() .header("token", MoGoAiCloudClient.getInstance().aiCloudClientConfig.token) + .header("cityCode", MoGoAiCloudClient.getInstance().aiCloudClientConfig.iHttpDnsCurrentLocation.getCurrentLocation()?.cityCode.toString()) + .header("lat",MoGoAiCloudClient.getInstance().aiCloudClientConfig.iHttpDnsCurrentLocation.getCurrentLocation()?.lat.toString()) + .header("lon",MoGoAiCloudClient.getInstance().aiCloudClientConfig.iHttpDnsCurrentLocation.getCurrentLocation()?.lon.toString()) + .header("env",MoGoAiCloudClient.getInstance().aiCloudClientConfig.netMode.toString()) + .header("sn",MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn) .method(original.method(), original.body()) .build() + return chain.proceed(request) } } \ No newline at end of file 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 ac2bb6e..7fd054e 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 @@ -95,18 +95,18 @@ public class MoGoAiCloudClient { mAiCloudClientConfig.setToken(token); } - // 初始化HttpDNS - if (mHttpDnsConfig == null) { - mHttpDnsConfig = - new MogoHttpDnsConfig() - .setContext(mContext) - .setSn(mAiCloudClientConfig.getSn()) - .setEnv(mAiCloudClientConfig.getNetMode()) - .setShowDebugLog(mAiCloudClientConfig.isShowDebugLog()) - .setCurrentLocation(mAiCloudClientConfig.getIHttpDnsCurrentLocation()) - .setLoopCheckDelay(mAiCloudClientConfig.getLoopCheckDelay()); - MogoHttpDnsClient.INSTANCE.init(mHttpDnsConfig); - } +// // 初始化HttpDNS +// if (mHttpDnsConfig == null) { +// mHttpDnsConfig = +// new MogoHttpDnsConfig() +// .setContext(mContext) +// .setSn(mAiCloudClientConfig.getSn()) +// .setEnv(mAiCloudClientConfig.getNetMode()) +// .setShowDebugLog(mAiCloudClientConfig.isShowDebugLog()) +// .setCurrentLocation(mAiCloudClientConfig.getIHttpDnsCurrentLocation()) +// .setLoopCheckDelay(mAiCloudClientConfig.getLoopCheckDelay()); +// MogoHttpDnsClient.INSTANCE.init(mHttpDnsConfig); +// } // 循环调用将数据传出去 for (IMoGoTokenCallback tokenCallback : mTokenCallbacks) { diff --git a/foudations/mogo-v2x/src/main/java/com/mogo/v2x/config/V2XConfig.kt b/foudations/mogo-v2x/src/main/java/com/mogo/v2x/config/V2XConfig.kt index bf0ff9d..086fdde 100755 --- a/foudations/mogo-v2x/src/main/java/com/mogo/v2x/config/V2XConfig.kt +++ b/foudations/mogo-v2x/src/main/java/com/mogo/v2x/config/V2XConfig.kt @@ -63,7 +63,7 @@ class V2XConfig private constructor(builder: Builder) { * - 通过[Builder.baseUrl]设置 */ val baseUrl by lazy { - builder.baseUrl ?: "http://dzt-launcherSnapshot.zhidaozhixing.com" + builder.baseUrl ?: "http://eagle-dns.zhidaozhixing.com/" } diff --git a/foudations/mogo-v2x/src/main/java/com/mogo/v2x/http/api/V2XApiService.kt b/foudations/mogo-v2x/src/main/java/com/mogo/v2x/http/api/V2XApiService.kt index f88986f..4f65b89 100644 --- a/foudations/mogo-v2x/src/main/java/com/mogo/v2x/http/api/V2XApiService.kt +++ b/foudations/mogo-v2x/src/main/java/com/mogo/v2x/http/api/V2XApiService.kt @@ -9,6 +9,6 @@ import retrofit2.http.POST internal interface V2XApiService { @FormUrlEncoded - @POST("/yycp-launcherSnapshot/launcherSnapshot/querySnapshotSync") + @POST("eagle-eye-dns/yycp-launcherSnapshot/launcherSnapshot/querySnapshotSync") fun querySnapshotSync(@FieldMap parameters: Map): Maybe } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index c82176d..939f247 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,26 +36,26 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.4.3.32 +MOGO_UTILS_VERSION=1.4.3.32-beta3 # 网络请求 -MOGO_NETWORK_VERSION=1.4.3.32 +MOGO_NETWORK_VERSION=1.4.3.32-beta3 # 网络DNS -MOGO_HTTPDNS_VERSION=1.4.3.32 +MOGO_HTTPDNS_VERSION=1.4.3.32-beta3 # 鉴权 -MOGO_PASSPORT_VERSION=1.4.3.32 +MOGO_PASSPORT_VERSION=1.4.3.32-beta3 # 常链接 -MOGO_SOCKET_VERSION=1.4.3.32 +MOGO_SOCKET_VERSION=1.4.3.32-beta3 # 数据采集 -MOGO_REALTIME_VERSION=1.4.3.32 +MOGO_REALTIME_VERSION=1.4.3.32-beta3 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.4.3.32 +MOGO_TANLU_VERSION=1.4.3.32-beta3 # 直播推流 -MOGO_LIVE_VERSION=1.4.3.32 +MOGO_LIVE_VERSION=1.4.3.32-beta3 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.4.3.32 +MOGO_TRAFFICLIVE_VERSION=1.4.3.32-beta3 # 定位服务 -MOGO_LOCATION_VERSION=1.4.3.32 +MOGO_LOCATION_VERSION=1.4.3.32-beta3 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.4.3.32 +MOGO_TELEMATIC_VERSION=1.4.3.32-beta2 # v2x -MOGO_V2X_VERSION=1.4.3.32 +MOGO_V2X_VERSION=1.4.3.32-beta3