yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bxb/dev_sweeper-d_modify_domain_name' into dev_sweeper-d_230423_3.1.0

Browse Source 
# Conflicts:
#	app/config/urlConfig.json
This commit is contained in:
bxb
2023-04-26 18:12:56 +08:00
parent de81c7a414 e7f74cffa7
commit d9a1c24945
4 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/constant/OchCommonConst.kt
View File

@@ -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

2
OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt
View File

@@ -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
)

9
app/config/urlConfig.json
View File

@@ -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": "",
@@ -14,6 +15,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": "",
@@ -25,6 +27,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": "",
@@ -38,6 +41,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/",
@@ -49,6 +53,7 @@
"online": {
"och_url": "https://och-driver-eh.zhidaozhixing.com",
"shuttle_url": "https://och-driver-eh.zhidaozhixing.com",
"sweeper_url": "https://och-driver-eh.zhidaozhixing.com",
"passport_url": "https://och-driver-eh.zhidaozhixing.com/arch/passport/",
"socket_base_url": "https://och-driver-eh.zhidaozhixing.com/arch/push/",
"socket_tech_url": "https://och-driver-eh.zhidaozhixing.com/arch/",
@@ -60,6 +65,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/",
@@ -73,6 +79,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/",
@@ -84,6 +91,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/",
@@ -95,6 +103,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/",

2
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt
View File

@@ -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")