Commit 42f451b3 by YKai

feat:动态获取网关代码配置

parent ecf3abfe
...@@ -9,3 +9,5 @@ const val YDL_DOMAIN = "Domain-Name:" ...@@ -9,3 +9,5 @@ const val YDL_DOMAIN = "Domain-Name:"
const val YDL_DOMAIN_JAVA = "JAVA_BASE_URL" const val YDL_DOMAIN_JAVA = "JAVA_BASE_URL"
//JAVA 域名 //JAVA 域名
const val YDL_DOMAIN_JAVA_URL = "YDL_DOMAIN_JAVA_URL" const val YDL_DOMAIN_JAVA_URL = "YDL_DOMAIN_JAVA_URL"
// JAVA Api 登录注册地址
const val YDL_DOMAIN_LOGIN_BASE_URL = "JAVA_LOGIN_BASE_URL"
...@@ -119,6 +119,7 @@ class GlobalConfig private constructor(var builder: Builder) { ...@@ -119,6 +119,7 @@ class GlobalConfig private constructor(var builder: Builder) {
apiFactory.setOkClient(okHttpClient) apiFactory.setOkClient(okHttpClient)
HttpConfig.getInstance().initAuth() HttpConfig.getInstance().initAuth()
HttpConfig.getInstance().initLoginBaseUrlConfig()
} }
} }
......
...@@ -99,6 +99,8 @@ class HttpConfig { ...@@ -99,6 +99,8 @@ class HttpConfig {
*/ */
var ACTION_URL = "" var ACTION_URL = ""
var JAVA_LOGIN_BASE_URL = "" // 登录注册动态配置网关地址
fun getInstance(): HttpConfig { fun getInstance(): HttpConfig {
return Holder.INSTANCE return Holder.INSTANCE
} }
...@@ -361,6 +363,7 @@ class HttpConfig { ...@@ -361,6 +363,7 @@ class HttpConfig {
PHP_BASE_URL = properties.getProperty("serverurl.$appEnv") PHP_BASE_URL = properties.getProperty("serverurl.$appEnv")
JAVA_BASE_URL = properties.getProperty("javaapi.$appEnv") JAVA_BASE_URL = properties.getProperty("javaapi.$appEnv")
JAVA_LOGIN_BASE_URL = JAVA_BASE_URL
ACTION_URL = properties.getProperty("actionurl.$appEnv") ACTION_URL = properties.getProperty("actionurl.$appEnv")
H5_URL = properties.getProperty("h5url.$appEnv") H5_URL = properties.getProperty("h5url.$appEnv")
...@@ -401,6 +404,26 @@ class HttpConfig { ...@@ -401,6 +404,26 @@ class HttpConfig {
} }
} }
/**
* 注册登录动态获取网关
*
*/
@SuppressLint("CheckResult")
fun initLoginBaseUrlConfig(){
ApiRequestUtil.getBaseUrl()
.compose(RxUtils.applySchedulers())
.compose(RxUtils.resultJavaData())
.subscribe({
if (it.baseUrlGatewayDTOList.isNotEmpty()){
if (it.baseUrlGatewayDTOList[0].goGateway){
JAVA_LOGIN_BASE_URL = it.baseUrlGatewayDTOList[0].baseUrl
}
}
}) {
LogUtil.i("HttpConfig", it.toString())
}
}
private object Holder { private object Holder {
val INSTANCE = HttpConfig() val INSTANCE = HttpConfig()
} }
......
package com.ydl.ydlcommon.bean
/**
* Created by Ykai on 2021/1/8.
*/
data class BaseUrlBean(
var baseUrlGatewayDTOList:List<UrlBean>
)
data class UrlBean(
var baseUrl:String,
var bizType:String?,
var goGateway:Boolean
)
\ No newline at end of file
...@@ -2,6 +2,7 @@ package com.ydl.ydlcommon.data.http.api; ...@@ -2,6 +2,7 @@ package com.ydl.ydlcommon.data.http.api;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.ydl.ydlcommon.bean.AuthBean; import com.ydl.ydlcommon.bean.AuthBean;
import com.ydl.ydlcommon.bean.BaseUrlBean;
import com.ydl.ydlcommon.bean.JavaGlobalInfo; import com.ydl.ydlcommon.bean.JavaGlobalInfo;
import com.ydl.ydlcommon.bean.MustUP; import com.ydl.ydlcommon.bean.MustUP;
import com.ydl.ydlcommon.data.http.BaseAPIResponse; import com.ydl.ydlcommon.data.http.BaseAPIResponse;
...@@ -58,4 +59,11 @@ public class ApiRequestUtil { ...@@ -58,4 +59,11 @@ public class ApiRequestUtil {
public static Observable<BaseAPIResponse<JavaGlobalInfo>> getJavaGlobalInfo() { public static Observable<BaseAPIResponse<JavaGlobalInfo>> getJavaGlobalInfo() {
return YDLHttpUtils.Companion.obtainApi(NetApiStore.class).getJavaGlobalInfo(); return YDLHttpUtils.Companion.obtainApi(NetApiStore.class).getJavaGlobalInfo();
} }
/**
* 获取登录注册模块网关
*/
public static Observable<BaseAPIResponse<BaseUrlBean>> getBaseUrl(){
return YDLHttpUtils.Companion.obtainApi(NetApiStore.class).getBaseUrl();
}
} }
package com.ydl.ydlcommon.data.http.api; package com.ydl.ydlcommon.data.http.api;
import com.ydl.ydlcommon.bean.AuthBean; import com.ydl.ydlcommon.bean.AuthBean;
import com.ydl.ydlcommon.bean.BaseUrlBean;
import com.ydl.ydlcommon.bean.JavaGlobalInfo; import com.ydl.ydlcommon.bean.JavaGlobalInfo;
import com.ydl.ydlcommon.bean.MustUP; import com.ydl.ydlcommon.bean.MustUP;
import com.ydl.ydlcommon.data.http.BaseAPIResponse; import com.ydl.ydlcommon.data.http.BaseAPIResponse;
...@@ -14,6 +15,7 @@ import retrofit2.http.Body; ...@@ -14,6 +15,7 @@ import retrofit2.http.Body;
import retrofit2.http.FieldMap; import retrofit2.http.FieldMap;
import retrofit2.http.FormUrlEncoded; import retrofit2.http.FormUrlEncoded;
import retrofit2.http.GET; import retrofit2.http.GET;
import retrofit2.http.Header;
import retrofit2.http.Headers; import retrofit2.http.Headers;
import retrofit2.http.POST; import retrofit2.http.POST;
...@@ -49,4 +51,7 @@ interface NetApiStore { ...@@ -49,4 +51,7 @@ interface NetApiStore {
@GET("config/socket-config") @GET("config/socket-config")
Observable<BaseAPIResponse<JavaGlobalInfo>> getJavaGlobalInfo(); Observable<BaseAPIResponse<JavaGlobalInfo>> getJavaGlobalInfo();
@Headers({YDL_DOMAIN+ YDL_DOMAIN_JAVA,"userPort:1"})
@POST("systemconfig/get_gateway_base_url")
Observable<BaseAPIResponse<BaseUrlBean>> getBaseUrl();
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment