Skip to content

Y
YDL-Component-Medical
Commit 73336195 by 刘鹏
Options

feat: 新域名配置flutter未升级，platform未上传到maven，待域名可调试开始接入

parent 896520dc
Showing with 14 additions and 97 deletions
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
......@@ -20,7 +20,8 @@ import java.util.List;
public final class DemoGlobalConfig implements IConfigModule {
String APP_DOMAIN = "https://api.github.com/";
// public static String appEnv = YDLConstants.ENV_AUTO_TEST;
public static String appEnv = YDLConstants.ENV_TEST;
// public static String appEnv = YDLConstants.ENV_TEST;
public static String appEnv = "new_test";//配置未上传到maven库
// public static String appEnv = YDLConstants.ENV_PROD;
@Override
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/common/http/utils/HttpUrlUtils.java deleted 100644 → 0
package com.yidianling.ydl_pay.common.http.utils;
import com.yidianling.ydl_pay.BuildConfig;
/**
* @author jiucheng
* @描述:获取api的baseUrl
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2019/4/23
*/
public class HttpUrlUtils {
private static final String JAVA_BASE_URL = "https://api.ydl.com/api/";
private static final String ACTION_BASE_URL = "https://api.ydl.com/api/data/bigdata/";
private static final String PHP_BASE_URL = "https://app2.yidianling.com/v3/";
private static final String DEBUG_JAVA_BASE_URL = "http://testapi.ydl.com/api/";
private static final String DEBUG_PHP_BASE_URL = "https://testapp2.yidianling.com/v3/";
private static final String DEBUG_ACTION_BASE_URL = "https://testapi.ydl.com/api/data/bigdata/";
/**
* 获取baseUrl
*
* @param isTestEnvironment 是否是测试环境
* @param isJava 是否是java url
* @return
*/
public static String getBaseUrl(boolean isTestEnvironment, boolean isJava) {
String baseUrl;
if (BuildConfig.DEBUG) {//debug包
if (isTestEnvironment) {//测试环境
if (isJava) {
baseUrl = DEBUG_JAVA_BASE_URL;
} else {
baseUrl = DEBUG_PHP_BASE_URL;
}
} else {
if (isJava) {
baseUrl = JAVA_BASE_URL;
} else {
baseUrl = PHP_BASE_URL;
}
}
} else {//release 包
if (isJava) {
baseUrl = JAVA_BASE_URL;
} else {
baseUrl = PHP_BASE_URL;
}
}
return baseUrl;
}
/**
* 获取埋点的baseurl
*
* @param isTestEnvironment 是否是测试环境
* @return
*/
public static String geActionUrl(boolean isTestEnvironment) {
String baseUrl;
if (BuildConfig.DEBUG) {//debug包
if (isTestEnvironment) {//测试环境
baseUrl = DEBUG_ACTION_BASE_URL;
} else {
baseUrl = ACTION_BASE_URL;
}
} else {//release 包
baseUrl = DEBUG_ACTION_BASE_URL;
}
return baseUrl;
}
}
ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/HttpConfig.kt
......@@ -102,15 +102,6 @@ class HttpConfig {
*/
var JAVA_URL = ""
/**
* h5耗时统计 java服务器api地址
*/
var SERVER_TEMP_JAVA_URL = ""
/**
* Java 投放系统 地址
*/
var JAVA_CAST_URL = ""
/**
* 行为数据 地址
......@@ -467,8 +458,6 @@ class HttpConfig {
MH5_URL = properties.getProperty("mh5url.$appEnv")
YDL_H5 = properties.getProperty("ydlh5url.$appEnv")
WEB_URL = properties.getProperty("weburl.$appEnv")
SERVER_TEMP_JAVA_URL = properties.getProperty("javatempurl.$appEnv")
JAVA_CAST_URL = properties.getProperty("javacasturl.$appEnv")
JAVA_URL = properties.getProperty("javaurl.$appEnv")
}
......
ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/YDLConstants.kt
......@@ -26,9 +26,10 @@ object YDLConstants {
const val ENV_TEST = "test"
const val ENV_AUTO_TEST = "auto_test"
const val ENV_NEW_TEST = "new_test"
const val ENV_PROD= "prod"
@StringDef(ENV_TEST, ENV_AUTO_TEST,ENV_PROD)
@StringDef(ENV_TEST, ENV_AUTO_TEST,ENV_PROD, ENV_NEW_TEST)
annotation class AppEnv
......
ydl-platform/src/main/res/raw/api.properties
#server php服务器api域名
serverurl.new_test=https://ydltestapp2.ydl.com/v3/
serverurl.test=https://testapp2.yidianling.com/v3/
serverurl.auto_test=https://auto_testapp2.yidianling.com/v3/
serverurl.prod=https://app2.yidianling.com/v3/
serverurl.pre=https://preapp.yidianling.com/v3/
#行为数据埋点域名
actionurl.new_test=https://ydltestapi.ydl.com/api/data/bigdata/
actionurl.test=https://testapi.ydl.com/api/data/bigdata/
actionurl.auto_test=https://auto_testapi.ydl.com/api/data/bigdata/
actionurl.prod=https://api.ydl.com/api/data/bigdata/
#新h5
weburl.new_test=https://ydltestwebapp.ydl.com/
weburl.test=https://testwebapp.ydl.com/
weburl.auto_test=https://auto_testwebapp.ydl.com/
weburl.prod=https://webapp.ydl.com/
#ydlh5
ydlh5url.new_test=https://ydltesth5.ydl.com/
ydlh5url.test=https://testh5.ydl.com/
ydlh5url.auto_test=https://auto_testh5.ydl.com/
#ydlh5url.test=http://192.168.204.5:3006/
ydlh5url.prod=https://h5.ydl.com/
#h5
h5url.new_test=https://ydltesth2.ydl.com/
h5url.test=https://testh2.yidianling.com/
h5url.auto_test=https://auto_testh2.yidianling.com/
h5url.prod=https://h2.yidianling.com/
h5url.pre=https://preh.yidianling.com/
#java服务器api域名（投放系统）
javacasturl.test = http://testdelivery.yidianling.com/
javacasturl.auto_test = http://auto_testdelivery.yidianling.com/
javacasturl.prod = https://delivery.yidianling.com/
#m站H5地址
mh5url.new_test = https://ydltestm.ydl.com/
mh5url.test = https://testnewm.ydl.com/
mh5url.auto_test = https://auto_testnewm.ydl.com/
mh5url.prod = https://m.ydl.com/
#java服务器域名
javaurl.new_test = https://ydltestapi.ydl.com/
javaurl.test = https://testapi.ydl.com/
javaurl.auto_test = https://auto_testapi.ydl.com/
javaurl.prod = https://api.ydl.com/
#java服务器api域名（h5耗时统计,域名问题后续服务端会统一）
javatempurl.test = https://47.97.49.44:8082/api/
javatempurl.auto_test = https://auto_testdc.ydl.com/api/
javatempurl.prod = https://dc.ydl.com/api/
#java服务器api统一域名
javaapi.new_test = https://ydltestapi.ydl.com/api/
javaapi.test = https://testapi.ydl.com/api/
javaapi.auto_test = https://auto_testapi.ydl.com/api/
javaapi.prod = https://api.ydl.com/api/
# 网关加密的appKey和appSecret
appKey.new_test = 20BB42485BD448DE888DD745899C457D
appSecret.new_test = ABA88F2FF7E64A688D2213B20A9B3A3E
appKey.test = 20BB42485BD448DE888DD745899C457D
appSecret.test = ABA88F2FF7E64A688D2213B20A9B3A3E
appKey.prod = 49A4A1BBFBC74CA2B0B5C6B77FF13A80
......
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