From e7f74cffa760dc6cf15e302237e0bbb97643075b Mon Sep 17 00:00:00 2001 From: bxb Date: Thu, 13 Apr 2023 14:49:37 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=E6=B8=85=E6=89=AB?= =?UTF-8?q?=E8=BD=A6=E5=9F=9F=E5=90=8D=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/common/module/biz/constant/OchCommonConst.kt | 4 ++++ .../com/mogo/och/sweeper/net/SweeperServiceManager.kt | 2 +- app/urlConfig.json | 9 +++++++++ .../main/java/com/mogo/eagle/core/data/app/UrlConfig.kt | 2 ++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/constant/OchCommonConst.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/constant/OchCommonConst.kt index 7102e3a8f3..fe0e21da28 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/constant/OchCommonConst.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/constant/OchCommonConst.kt @@ -15,6 +15,10 @@ class OchCommonConst { fun getShuttleUrl(): String { return FunctionBuildConfig.urlJson.shuttleUrl } + @JvmStatic + fun getSweeperUrl(): String { + return FunctionBuildConfig.urlJson.sweeperUrl + } // token 失效 重新获取token const val WAIT_TAKEN = 100046 diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt index 118807dbb7..7ded92408d 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt @@ -15,7 +15,7 @@ import com.mogo.och.sweeper.model.SweeperTaskModel object SweeperServiceManager { private val TAG = SweeperTaskModel::class.java.simpleName - private val mService: ISweeperApiService = MoGoRetrofitFactory.getInstance(OchCommonConst.getBaseUrl()).create( + private val mService: ISweeperApiService = MoGoRetrofitFactory.getInstance(OchCommonConst.getSweeperUrl()).create( ISweeperApiService::class.java ) diff --git a/app/urlConfig.json b/app/urlConfig.json index f05fe5d46e..ef0f5ac2bc 100644 --- a/app/urlConfig.json +++ b/app/urlConfig.json @@ -3,6 +3,7 @@ "qa": { "och_url": "https://tech-qa.zhidaohulian.com", "shuttle_url": "https://och-driver-qa.zhidaozhixing.com", + "sweeper_url": "https://och-driver-qa.zhidaozhixing.com", "passport_url": "", "socket_base_url": "", "socket_tech_url": "", @@ -12,6 +13,7 @@ "online": { "och_url": "https://tech.zhidaohulian.com", "shuttle_url": "https://och-driver.zhidaozhixing.com", + "sweeper_url": "https://och-driver.zhidaozhixing.com", "passport_url": "", "socket_base_url": "", "socket_tech_url": "", @@ -21,6 +23,7 @@ "demo": { "och_url": "http://tech-dev.zhidaohulian.com", "shuttle_url": "https://och-driver-dev.zhidaozhixing.com", + "sweeper_url": "https://och-driver-dev.zhidaozhixing.com", "passport_url": "", "socket_base_url": "", "socket_tech_url": "", @@ -32,6 +35,7 @@ "qa": { "och_url": "https://och-a.zhidaozhixing.com", "shuttle_url": "https://och-a.zhidaozhixing.com", + "sweeper_url": "https://och-a.zhidaozhixing.com", "passport_url": "https://och-a.zhidaozhixing.com/arch/passport/", "socket_base_url": "https://och-a.zhidaozhixing.com/arch/push/", "socket_tech_url": "https://och-a.zhidaozhixing.com/arch/", @@ -41,6 +45,7 @@ "online": { "och_url": "https://och-driver-eh.zhidaozhixing.com:18182", "shuttle_url": "https://och-driver-eh.zhidaozhixing.com:18182", + "sweeper_url": "https://och-driver-eh.zhidaozhixing.com:18182", "passport_url": "https://och-driver-eh.zhidaozhixing.com:18182/arch/passport/", "socket_base_url": "https://och-driver-eh.zhidaozhixing.com:18182/arch/push/", "socket_tech_url": "https://och-driver-eh.zhidaozhixing.com:18182/arch/", @@ -50,6 +55,7 @@ "demo": { "och_url": "https://och-a.zhidaozhixing.com", "shuttle_url": "https://och-a.zhidaozhixing.com", + "sweeper_url": "https://och-a.zhidaozhixing.com", "passport_url": "https://och-a.zhidaozhixing.com/arch/passport/", "socket_base_url": "https://och-a.zhidaozhixing.com/arch/push/", "socket_tech_url": "https://och-a.zhidaozhixing.com/arch/", @@ -61,6 +67,7 @@ "qa": { "och_url": "https://och-a.zhidaozhixing.com", "shuttle_url": "https://och-a.zhidaozhixing.com", + "sweeper_url": "https://och-a.zhidaozhixing.com", "passport_url": "https://och-a.zhidaozhixing.com/arch/passport/", "socket_base_url": "https://och-a.zhidaozhixing.com/arch/push/", "socket_tech_url": "https://och-a.zhidaozhixing.com/arch/", @@ -70,6 +77,7 @@ "online": { "och_url": "https://och-driver-yt.zhidaozhixing.com", "shuttle_url": "https://och-driver-yt.zhidaozhixing.com", + "sweeper_url": "https://och-driver-yt.zhidaozhixing.com", "passport_url": "https://och-driver-yt.zhidaozhixing.com/arch/passport/", "socket_base_url": "https://och-driver-yt.zhidaozhixing.com/arch/push/", "socket_tech_url": "https://och-driver-yt.zhidaozhixing.com/arch/", @@ -79,6 +87,7 @@ "demo": { "och_url": "https://och-a.zhidaozhixing.com", "shuttle_url": "https://och-a.zhidaozhixing.com", + "sweeper_url": "https://och-a.zhidaozhixing.com", "passport_url": "https://och-a.zhidaozhixing.com/arch/passport/", "socket_base_url": "https://och-a.zhidaozhixing.com/arch/push/", "socket_tech_url": "https://och-a.zhidaozhixing.com/arch/", diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt index 3e34c7a397..367f8e95ef 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt @@ -7,6 +7,8 @@ data class UrlConfig( val ochUrl: String, @SerializedName("shuttle_url") val shuttleUrl: String, + @SerializedName("sweeper_url") + val sweeperUrl: String, @SerializedName("passport_url") val passportUrl: String, @SerializedName("socket_base_url")