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 1727c4b..a1043fe 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 @@ -11,17 +11,19 @@ import okhttp3.Response class HttpHeaderInterceptor : Interceptor { override fun intercept(chain: Interceptor.Chain): Response { val original = chain.request() + val aiCloudClientConfig = MoGoAiCloudClient.getInstance().aiCloudClientConfig + val iHttpCurrentLocation = aiCloudClientConfig.iHttpCurrentLocation.currentLocation var request = original.newBuilder() - .header("token", MoGoAiCloudClient.getInstance().aiCloudClientConfig.token) - .header("cityCode", MoGoAiCloudClient.getInstance().aiCloudClientConfig.iHttpCurrentLocation.currentLocation?.cityCode.toString()) - .header("lat",MoGoAiCloudClient.getInstance().aiCloudClientConfig.iHttpCurrentLocation.currentLocation?.lat.toString()) - .header("lon",MoGoAiCloudClient.getInstance().aiCloudClientConfig.iHttpCurrentLocation.currentLocation?.lon.toString()) - .header("env",MoGoAiCloudClient.getInstance().aiCloudClientConfig.netMode.toString()) - .header("sn",MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn) - .method(original.method(), original.body()) - .build() - if(MoGoAiCloudClient.getInstance().aiCloudClientConfig.securityKey.isNotBlank()){ - request = request.newBuilder().header("authKey",MoGoAiCloudClient.getInstance().aiCloudClientConfig.securityKey).build() + .header("token", aiCloudClientConfig.token) + .header("cityCode", iHttpCurrentLocation?.cityCode.toString()) + .header("lat", iHttpCurrentLocation?.lat.toString()) + .header("lon", iHttpCurrentLocation?.lon.toString()) + .header("env", aiCloudClientConfig.netMode.toString()) + .header("sn", aiCloudClientConfig.sn) + .method(original.method(), original.body()) + .build() + if(aiCloudClientConfig.securityKey.isNotBlank()){ + request = request.newBuilder().header("authKey", aiCloudClientConfig.securityKey).build() } return chain.proceed(request) }