Skip to content

Y
YDL-Component-Medical
Commit 69266001 by konghaorui
Options

修改 java 域名配置信息

parent 358dcf8d
Showing with 71 additions and 117 deletions
api.properties deleted 100644 → 0
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
#org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
#org.gradle.parallel=true
# org.gradle.parallel=true
#org.gradle.parallel=true
android.useDeprecatedNdk=true
android.enableAapt2=false
# pack:test|prod|pre test测试 prod正式
#pack=pre
#pack=auto_test
#pack=test
pack=prod
#予发布环境
#http://prem.yidianling.com/
#server php服务器api域名
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.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.test=https://testwebapp.ydl.com/
weburl.auto_test=https://auto_testwebapp.ydl.com/
weburl.prod=https://webapp.ydl.com/
#ydlh5
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.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域名（投放系统）
javaurl.test = http://testdelivery.yidianling.com/
javaurl.auto_test = http://auto_testdelivery.yidianling.com/
javaurl.prod = https://delivery.yidianling.com/
#m站H5地址
mh5url.test = https://testnewm.ydl.com/
mh5url.auto_test = https://auto_testnewm.ydl.com/
mh5url.prod = https://m.ydl.com/
#java服务器api域名(优惠券)
javacouponurl.test = https://testapi.ydl.com/
javacouponurl.auto_test = https://auto_testapi.ydl.com/
javacouponurl.prod = https://api.ydl.com/
#java服务器api域名（h5耗时统计,域名问题后续服务端会统一）
javatempurl.test = https://47.97.49.44:8082/api/
javatempurl.prod = https://dc.ydl.com/api/
#java服务器api统一域名
javaapi.test = https://testapi.ydl.com/api/
javaapi.auto_test = https://auto_testapi.ydl.com/api/
javaapi.prod = https://api.ydl.com/api/
#android.enableBuildCache=true
#org.gradle.caching=true
#org.gradle.daemon=true
#org.gradle.jvmargs=-Xmx4096M
#systemProp.http.proxyHost=192.168.98.150
#systemProp.http.proxyPort=8123
org.gradle.jvmargs=-Xmx1024M
config.gradle
ext {
kotlin_version = "1.3.21"
dev_mode = true
dev_mode = false
ydl_app = [
appName : "心理咨询壹点灵",
......
m-course/src/main/java/com/yidianling/course/net/NetApiStore.java
......@@ -2,20 +2,36 @@ package com.yidianling.course.net;
import com.ydl.ydlcommon.data.http.BaseAPIResponse;
import com.ydl.ydlcommon.data.http.BaseResponse;
import com.yidianling.course.bean.*;
import com.yidianling.course.bean.CouponHintResponseBean;
import com.yidianling.course.bean.Course;
import com.yidianling.course.bean.CourseAddOrderBean;
import com.yidianling.course.bean.CourseCouponBean;
import com.yidianling.course.bean.CourseListDataBean;
import com.yidianling.course.bean.CourseMediaDetailBean;
import com.yidianling.course.bean.CoursePlayBean;
import com.yidianling.course.bean.PostersShareBean;
import com.yidianling.course.course_special_list.bean.CourseSpecialListBean;
import com.yidianling.course.model.CourseCategoryBean;
import com.yidianling.course.model.TopicCourseBean;
import io.reactivex.Observable;
import okhttp3.RequestBody;
import retrofit2.http.*;
import java.util.List;
import java.util.Map;
import io.reactivex.Observable;
import okhttp3.RequestBody;
import retrofit2.http.Body;
import retrofit2.http.FieldMap;
import retrofit2.http.FormUrlEncoded;
import retrofit2.http.GET;
import retrofit2.http.Headers;
import retrofit2.http.POST;
import retrofit2.http.Query;
import retrofit2.http.QueryMap;
import retrofit2.http.Url;
import static com.ydl.ydlcommon.base.config.AppConfigKt.YDL_DOMAIN;
import static com.ydl.ydlcommon.base.config.AppConfigKt.YDL_DOMAIN_COUPON_URL;
import static com.ydl.ydlcommon.base.config.AppConfigKt.YDL_DOMAIN_JAVA;
import static com.ydl.ydlcommon.base.config.AppConfigKt.YDL_DOMAIN_JAVA_URL;
/**
* Created by Jim on 2018/2/26 0026.
......@@ -88,7 +104,7 @@ public interface NetApiStore {
* @return
*/
@GET("marketing/coupon/new/available")
@Headers(YDL_DOMAIN + YDL_DOMAIN_COUPON_URL)
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL)
Observable<BaseResponse<List<CourseCouponBean>>> getCourseCoupons(@Query("uid") String uid,
@Query("services") String services,
@Query("receiveType") String receiveType,
......@@ -96,7 +112,7 @@ public interface NetApiStore {
//领取优惠券
@POST("marketing/coupon/new/receives")
@Headers(YDL_DOMAIN + YDL_DOMAIN_COUPON_URL)
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL)
Observable<BaseResponse<List<String>>> receiveCoupon(@Body RequestBody body);
......
ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/AppConfig.kt
......@@ -5,5 +5,7 @@ package com.ydl.ydlcommon.base.config
* Des:
*/
const val YDL_DOMAIN = "Domain-Name:"
//JAVA Api 地址
const val YDL_DOMAIN_JAVA = "JAVA_BASE_URL"
const val YDL_DOMAIN_COUPON_URL = "SERVER_COUPON_URL"
//JAVA 域名
const val YDL_DOMAIN_JAVA_URL = "YDL_DOMAIN_JAVA_URL"
ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/GlobalConfig.kt
......@@ -83,7 +83,7 @@ class GlobalConfig private constructor(var builder: Builder) {
.config()
.setBaseUrl(appBaseURL ?: HttpConfig.PHP_BASE_URL)
.addUrl(YDL_DOMAIN_JAVA, HttpConfig.JAVA_BASE_URL)
.addUrl(YDL_DOMAIN_COUPON_URL, HttpConfig.SERVER_COUPON_URL)
.addUrl(YDL_DOMAIN_JAVA_URL, HttpConfig.JAVA_URL)
.setMultipleUrlMap(multipleUrl)
if (okHttpClient == null) {
......
ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/HttpConfig.kt
......@@ -56,16 +56,45 @@ class HttpConfig {
private val AUTH_INEFFECTIVE_CODE = "-201"
//====================网络环境====================
/**
* PHP API 地址
*/
var PHP_BASE_URL = ""
/**
* Java API 地址
*/
var JAVA_BASE_URL = ""
/**
* YDL H5 地址
*/
var YDL_H5 = ""
/**
* H5 地址
*/
var H5_URL = ""
/**
* M站 地址
*/
var MH5_URL = ""
/**
* 新 H5 地址
*/
var WEB_URL = ""
var SERVER_COUPON_URL = ""
/**
* Java API 域名
*/
var JAVA_URL = ""
/**
* h5耗时统计 java服务器api地址
*/
var SERVER_TEMP_JAVA_URL = ""
var SERVER_API_JAVA_URL = ""
/**
* Java 投放系统 地址
*/
var JAVA_CAST_URL = ""
/**
* 行为数据 地址
*/
var ACTION_URL = ""
fun getInstance(): HttpConfig {
......@@ -328,8 +357,8 @@ class HttpConfig {
YDL_H5 = properties.getProperty("ydlh5url.$appEnv")
WEB_URL = properties.getProperty("weburl.$appEnv")
SERVER_TEMP_JAVA_URL = properties.getProperty("javatempurl.$appEnv")
SERVER_API_JAVA_URL = properties.getProperty("javaurl.$appEnv")
SERVER_COUPON_URL = properties.getProperty("javacouponurl.$appEnv")
JAVA_CAST_URL = properties.getProperty("javacasturl.$appEnv")
JAVA_URL = properties.getProperty("javaurl.$appEnv")
}
@SuppressLint("CheckResult")
......
ydl-platform/src/main/java/com/ydl/ydlcommon/data/http/api/NetApiStore.java
......@@ -17,6 +17,7 @@ import retrofit2.http.POST;
import static com.ydl.ydlcommon.base.config.AppConfigKt.YDL_DOMAIN;
import static com.ydl.ydlcommon.base.config.AppConfigKt.YDL_DOMAIN_JAVA;
import static com.ydl.ydlcommon.base.config.AppConfigKt.YDL_DOMAIN_JAVA_URL;
/**
* 网络请求api
......@@ -38,7 +39,7 @@ interface NetApiStore {
@POST("data/bigdata/maidian/writeMaiDianData")
Observable<BaseAPIResponse<String>> actionDataCount(@Body RequestBody body);
@Headers(YDL_DOMAIN+ YDL_DOMAIN_JAVA)
@Headers(YDL_DOMAIN+ YDL_DOMAIN_JAVA_URL)
@POST("risk/key/info")
Observable<BaseAPIResponse<AuthBean>> getDynamicToken();
......
ydl-platform/src/main/res/raw/api.properties
......@@ -28,19 +28,19 @@ h5url.prod=https://h2.yidianling.com/
h5url.pre=https://preh.yidianling.com/
#java服务器api域名（投放系统）
javaurl.test = http://testdelivery.yidianling.com/
javaurl.auto_test = http://auto_testdelivery.yidianling.com/
javaurl.prod = https://delivery.yidianling.com/
javacasturl.test = http://testdelivery.yidianling.com/
javacasturl.auto_test = http://auto_testdelivery.yidianling.com/
javacasturl.prod = https://delivery.yidianling.com/
#m站H5地址
mh5url.test = https://testnewm.ydl.com/
mh5url.auto_test = https://auto_testnewm.ydl.com/
mh5url.prod = https://m.ydl.com/
#java服务器api域名(优惠券)
javacouponurl.test = https://testapi.ydl.com/
javacouponurl.auto_test = https://auto_testapi.ydl.com/
javacouponurl.prod = https://api.ydl.com/
#java服务器域名
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/
......
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