Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨凯
YDL-Component-Medical
Commits
6d030f2f
Commit
6d030f2f
authored
Dec 01, 2021
by
霍志良
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:域名修改
parent
67483bde
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
28 additions
and
28 deletions
+28
-28
DemoGlobalConfig.java
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
+2
-2
config.gradle
config.gradle
+4
-4
ImRetrofitApi.kt
m-im/src/main/java/com/yidianling/im/http/ImRetrofitApi.kt
+1
-1
ServiceApi.kt
m-im/src/main/java/com/yidianling/uikit/custom/http/ServiceApi.kt
+7
-7
UserApi.kt
m-user/src/main/java/com/yidianling/user/http/UserApi.kt
+6
-6
MedicalPayServices.kt
ydl-medical-pay/src/main/java/com/medical/ydl/medical/http/MedicalPayServices.kt
+2
-2
HttpConfig.kt
ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/HttpConfig.kt
+1
-1
NetApiStore.java
ydl-platform/src/main/java/com/ydl/ydlcommon/data/http/api/NetApiStore.java
+1
-1
api.properties
ydl-platform/src/main/res/raw/api.properties
+4
-4
No files found.
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
View file @
6d030f2f
...
@@ -20,8 +20,8 @@ import java.util.List;
...
@@ -20,8 +20,8 @@ import java.util.List;
public
final
class
DemoGlobalConfig
implements
IConfigModule
{
public
final
class
DemoGlobalConfig
implements
IConfigModule
{
String
APP_DOMAIN
=
"https://api.github.com/"
;
String
APP_DOMAIN
=
"https://api.github.com/"
;
// public static String appEnv = YDLConstants.ENV_TEST;
// public static String appEnv = YDLConstants.ENV_TEST;
public
static
String
appEnv
=
YDLConstants
.
ENV_NEW_TEST
;
//
public static String appEnv = YDLConstants.ENV_NEW_TEST;
//
public static String appEnv = YDLConstants.ENV_PROD;
public
static
String
appEnv
=
YDLConstants
.
ENV_PROD
;
@Override
@Override
public
void
injectAppLifecycle
(
@NotNull
Context
context
,
@NotNull
List
<
IAppLifecycles
>
lifecycles
)
{
public
void
injectAppLifecycle
(
@NotNull
Context
context
,
@NotNull
List
<
IAppLifecycles
>
lifecycles
)
{
...
...
config.gradle
View file @
6d030f2f
...
@@ -8,7 +8,7 @@ ext {
...
@@ -8,7 +8,7 @@ ext {
"m-confide"
:
"0.0.49.10"
,
"m-confide"
:
"0.0.49.10"
,
"m-consultant"
:
"0.0.59.91"
,
"m-consultant"
:
"0.0.59.91"
,
"m-fm"
:
"0.0.30.03"
,
"m-fm"
:
"0.0.30.03"
,
"m-user"
:
"0.0.61.8
4
"
,
"m-user"
:
"0.0.61.8
6
"
,
"m-home"
:
"0.0.22.70"
,
"m-home"
:
"0.0.22.70"
,
"m-im"
:
"0.0.20.61"
,
"m-im"
:
"0.0.20.61"
,
"m-dynamic"
:
"0.0.7.28"
,
"m-dynamic"
:
"0.0.7.28"
,
...
@@ -33,7 +33,7 @@ ext {
...
@@ -33,7 +33,7 @@ ext {
//-------------- 功能组件 --------------
//-------------- 功能组件 --------------
//第一步
//第一步
"ydl-platform"
:
"0.0.40.
59
"
,
"ydl-platform"
:
"0.0.40.
62
"
,
//第二步 若干
//第二步 若干
"ydl-webview"
:
"0.0.38.53"
,
"ydl-webview"
:
"0.0.38.53"
,
...
@@ -92,7 +92,7 @@ ext {
...
@@ -92,7 +92,7 @@ ext {
"m-confide"
:
"0.0.49.10"
,
"m-confide"
:
"0.0.49.10"
,
"m-consultant"
:
"0.0.59.91"
,
"m-consultant"
:
"0.0.59.91"
,
"m-fm"
:
"0.0.30.01"
,
"m-fm"
:
"0.0.30.01"
,
"m-user"
:
"0.0.61.8
4
"
,
"m-user"
:
"0.0.61.8
6
"
,
"m-home"
:
"0.0.22.70"
,
"m-home"
:
"0.0.22.70"
,
"m-im"
:
"0.0.20.61"
,
"m-im"
:
"0.0.20.61"
,
"m-dynamic"
:
"0.0.7.28"
,
"m-dynamic"
:
"0.0.7.28"
,
...
@@ -116,7 +116,7 @@ ext {
...
@@ -116,7 +116,7 @@ ext {
//-------------- 功能组件 --------------
//-------------- 功能组件 --------------
//第一步
//第一步
"ydl-platform"
:
"0.0.40.
59
"
,
"ydl-platform"
:
"0.0.40.
61
"
,
//第二步 若干
//第二步 若干
"ydl-webview"
:
"0.0.38.53"
,
"ydl-webview"
:
"0.0.38.53"
,
...
...
m-im/src/main/java/com/yidianling/im/http/ImRetrofitApi.kt
View file @
6d030f2f
...
@@ -165,7 +165,7 @@ interface ImRetrofitApi {
...
@@ -165,7 +165,7 @@ interface ImRetrofitApi {
//获取医生问诊状态
//获取医生问诊状态
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
,
"Content-Type:application/json"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
,
"Content-Type:application/json"
)
@GET
(
"
ydl-yiliao-api/
api/client/inquiry/v1/getInquIryIngInfo"
)
@GET
(
"api/client/inquiry/v1/getInquIryIngInfo"
)
fun
getInquIryIngInfo
(
fun
getInquIryIngInfo
(
@Query
(
"doctorUid"
)
doctorId
:
String
,
@Query
(
"doctorUid"
)
doctorId
:
String
,
@Query
(
"userUid"
)
userUid
:
String
@Query
(
"userUid"
)
userUid
:
String
...
...
m-im/src/main/java/com/yidianling/uikit/custom/http/ServiceApi.kt
View file @
6d030f2f
...
@@ -122,7 +122,7 @@ interface ServiceApi {
...
@@ -122,7 +122,7 @@ interface ServiceApi {
):
Observable
<
BaseAPIResponse
<
String
>>
):
Observable
<
BaseAPIResponse
<
String
>>
//医疗获取患者管理列表,支持分页
//医疗获取患者管理列表,支持分页
@GET
(
"
ydl-yiliao-api/
api/client/user/patient/v1/getPageList"
)
@GET
(
"api/client/user/patient/v1/getPageList"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
fun
getPageList
(
fun
getPageList
(
@Query
(
"pageNum"
)
pageNum
:
Int
,
@Query
(
"pageNum"
)
pageNum
:
Int
,
...
@@ -130,37 +130,37 @@ interface ServiceApi {
...
@@ -130,37 +130,37 @@ interface ServiceApi {
):
Observable
<
BaseAPIResponse
<
MedicalUserArchivesBean
>>
):
Observable
<
BaseAPIResponse
<
MedicalUserArchivesBean
>>
//医疗 获取问诊人列表
//医疗 获取问诊人列表
@GET
(
"
ydl-yiliao-api/
api/client/user/patient/v1/getList"
)
@GET
(
"api/client/user/patient/v1/getList"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
fun
getList
():
Observable
<
BaseAPIResponse
<
List
<
MedicalArchivesListBean
>>>
fun
getList
():
Observable
<
BaseAPIResponse
<
List
<
MedicalArchivesListBean
>>>
//医疗 创建问诊人
//医疗 创建问诊人
@POST
(
"
ydl-yiliao-api/
api/client/user/patient/v1/create"
)
@POST
(
"api/client/user/patient/v1/create"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
fun
createArchives
(
@Body
body
:
RequestBody
):
Observable
<
BaseAPIResponse
<
Any
>>
fun
createArchives
(
@Body
body
:
RequestBody
):
Observable
<
BaseAPIResponse
<
Any
>>
//医疗 创建问诊订单
//医疗 创建问诊订单
@POST
(
"
ydl-yiliao-api/
api/client/inquiry/v1/create"
)
@POST
(
"api/client/inquiry/v1/create"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
fun
createArchivesOrder
(
@Body
body
:
RequestBody
):
Observable
<
BaseAPIResponse
<
CreateArchivesRespose
>>
fun
createArchivesOrder
(
@Body
body
:
RequestBody
):
Observable
<
BaseAPIResponse
<
CreateArchivesRespose
>>
//医疗 删除问诊人
//医疗 删除问诊人
@POST
(
"
ydl-yiliao-api/
api/client/user/patient/v1/delete"
)
@POST
(
"api/client/user/patient/v1/delete"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
fun
deleteArchives
(
@Body
body
:
RequestBody
):
Observable
<
BaseAPIResponse
<
Any
>>
fun
deleteArchives
(
@Body
body
:
RequestBody
):
Observable
<
BaseAPIResponse
<
Any
>>
//上传文件,多文件批量上传
//上传文件,多文件批量上传
@POST
(
"
ydl-yiliao-api/
api/client/common/v1/uploadBatch"
)
@POST
(
"api/client/common/v1/uploadBatch"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
@Multipart
@Multipart
fun
uploadBatch
(
@PartMap
params
:
TreeMap
<
String
,
RequestBody
>):
Observable
<
BaseAPIResponse
<
List
<
MedicalFileBeanRespose
>>>
fun
uploadBatch
(
@PartMap
params
:
TreeMap
<
String
,
RequestBody
>):
Observable
<
BaseAPIResponse
<
List
<
MedicalFileBeanRespose
>>>
//上传文件,单文件上传
//上传文件,单文件上传
@POST
(
"
ydl-yiliao-api/
api/client/common/v1/upload"
)
@POST
(
"api/client/common/v1/upload"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
fun
upload
(
@PartMap
params
:
TreeMap
<
String
,
RequestBody
>):
Observable
<
BaseAPIResponse
<
MedicalFileBeanRespose
>>
fun
upload
(
@PartMap
params
:
TreeMap
<
String
,
RequestBody
>):
Observable
<
BaseAPIResponse
<
MedicalFileBeanRespose
>>
...
...
m-user/src/main/java/com/yidianling/user/http/UserApi.kt
View file @
6d030f2f
...
@@ -29,7 +29,7 @@ interface UserApi {
...
@@ -29,7 +29,7 @@ interface UserApi {
fun
login
(
@FieldMap
params
:
Map
<
String
,
String
>):
Observable
<
BaseResponse
<
UserResponseBean
>>
fun
login
(
@FieldMap
params
:
Map
<
String
,
String
>):
Observable
<
BaseResponse
<
UserResponseBean
>>
//国家列表
//国家列表
@GET
(
"
ydl-yiliao-api/
api/client/login/v1/get_country_code_list"
)
@GET
(
"api/client/login/v1/get_country_code_list"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_LOGIN_BASE_URL
,
LOGIN_USER_PORT
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_LOGIN_BASE_URL
,
LOGIN_USER_PORT
)
fun
countryList
(
@Query
(
"gatewayUrl"
)
gatewayUrl
:
String
):
Observable
<
BaseResponse
<
List
<
CountryResponse
>>>
fun
countryList
(
@Query
(
"gatewayUrl"
)
gatewayUrl
:
String
):
Observable
<
BaseResponse
<
List
<
CountryResponse
>>>
...
@@ -96,7 +96,7 @@ interface UserApi {
...
@@ -96,7 +96,7 @@ interface UserApi {
//登出
//登出
@FormUrlEncoded
@FormUrlEncoded
@POST
(
"
ydl-yiliao-api/
api/client/login/v1/logout"
)
@POST
(
"api/client/login/v1/logout"
)
fun
logout
(
@FieldMap
params
:
Map
<
String
,
String
>):
Observable
<
BaseResponse
<
Any
>>
fun
logout
(
@FieldMap
params
:
Map
<
String
,
String
>):
Observable
<
BaseResponse
<
Any
>>
//更换手机时密码验证
//更换手机时密码验证
...
@@ -168,14 +168,14 @@ interface UserApi {
...
@@ -168,14 +168,14 @@ interface UserApi {
/**
/**
* 密码登录
* 密码登录
*/
*/
@POST
(
"
ydl-yiliao-api/
api/client/login/v1/login_pwd"
)
@POST
(
"api/client/login/v1/login_pwd"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_LOGIN_BASE_URL
,
LOGIN_USER_PORT
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_LOGIN_BASE_URL
,
LOGIN_USER_PORT
)
fun
loginByPassword
(
@Body
body
:
RequestBody
):
Observable
<
BaseResponse
<
UserResponseBean
>>
fun
loginByPassword
(
@Body
body
:
RequestBody
):
Observable
<
BaseResponse
<
UserResponseBean
>>
/**
/**
* 验证码登录
* 验证码登录
*/
*/
@POST
(
"
ydl-yiliao-api/
api/client/login/v1/login_sms"
)
@POST
(
"api/client/login/v1/login_sms"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_LOGIN_BASE_URL
,
LOGIN_USER_PORT
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_LOGIN_BASE_URL
,
LOGIN_USER_PORT
)
fun
loginByMsgCode
(
@Body
body
:
RequestBody
):
Observable
<
BaseResponse
<
UserResponseBean
>>
fun
loginByMsgCode
(
@Body
body
:
RequestBody
):
Observable
<
BaseResponse
<
UserResponseBean
>>
...
@@ -189,7 +189,7 @@ interface UserApi {
...
@@ -189,7 +189,7 @@ interface UserApi {
/**
/**
* 检查手机号来源
* 检查手机号来源
*/
*/
@GET
(
"
ydl-yiliao-api/
api/client/login/v1/phone_detection"
)
@GET
(
"api/client/login/v1/phone_detection"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_LOGIN_BASE_URL
,
LOGIN_USER_PORT
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_LOGIN_BASE_URL
,
LOGIN_USER_PORT
)
fun
checkPhoneStatus
(
fun
checkPhoneStatus
(
@Query
(
"phone"
)
phone
:
String
,
@Query
(
"phone"
)
phone
:
String
,
...
@@ -218,7 +218,7 @@ interface UserApi {
...
@@ -218,7 +218,7 @@ interface UserApi {
/**
/**
* 发送登录验证码
* 发送登录验证码
*/
*/
@GET
(
"
ydl-yiliao-api/
api/client/login/v1/send_login_sms"
)
@GET
(
"api/client/login/v1/send_login_sms"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_LOGIN_BASE_URL
,
LOGIN_USER_PORT
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_LOGIN_BASE_URL
,
LOGIN_USER_PORT
)
fun
sendLoginMsgCode
(
fun
sendLoginMsgCode
(
@Query
(
"phone"
)
phone
:
String
,
@Query
(
"phone"
)
phone
:
String
,
...
...
ydl-medical-pay/src/main/java/com/medical/ydl/medical/http/MedicalPayServices.kt
View file @
6d030f2f
...
@@ -13,7 +13,7 @@ interface MedicalPayServices {
...
@@ -13,7 +13,7 @@ interface MedicalPayServices {
/**
/**
* 问诊订单创建支付
* 问诊订单创建支付
*/
*/
@POST
(
"
ydl-yiliao-api/
api/pay/createPay"
)
@POST
(
"api/pay/createPay"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
fun
getOrderInfo
(
@Body
body
:
RequestBody
):
Observable
<
BaseResponse
<
CreatePayRespose
>>
fun
getOrderInfo
(
@Body
body
:
RequestBody
):
Observable
<
BaseResponse
<
CreatePayRespose
>>
...
@@ -21,7 +21,7 @@ interface MedicalPayServices {
...
@@ -21,7 +21,7 @@ interface MedicalPayServices {
/**
/**
* 获取订单结束时间
* 获取订单结束时间
*/
*/
@GET
(
"
ydl-yiliao-api/
api/client/inquiry/v1/getSurplusPayTime"
)
@GET
(
"api/client/inquiry/v1/getSurplusPayTime"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
fun
getSurplusPayTime
(
@Query
(
"inquiryOrderId"
)
inquiryOrderId
:
String
):
Observable
<
BaseResponse
<
PayTimeRespose
>>
fun
getSurplusPayTime
(
@Query
(
"inquiryOrderId"
)
inquiryOrderId
:
String
):
Observable
<
BaseResponse
<
PayTimeRespose
>>
...
...
ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/HttpConfig.kt
View file @
6d030f2f
...
@@ -534,8 +534,8 @@ class HttpConfig {
...
@@ -534,8 +534,8 @@ class HttpConfig {
.
subscribe
({
.
subscribe
({
if
(
it
.
baseUrlGatewayDTOList
.
isNotEmpty
())
{
if
(
it
.
baseUrlGatewayDTOList
.
isNotEmpty
())
{
isEncryption
=
it
.
baseUrlGatewayDTOList
[
0
].
goGateway
isEncryption
=
it
.
baseUrlGatewayDTOList
[
0
].
goGateway
GET_GATEWAY_BASE_URL
=
it
.
baseUrlGatewayDTOList
[
0
].
baseUrl
if
(
isEncryption
)
{
if
(
isEncryption
)
{
GET_GATEWAY_BASE_URL
=
it
.
baseUrlGatewayDTOList
[
0
].
baseUrl
JAVA_LOGIN_BASE_URL
=
it
.
baseUrlGatewayDTOList
[
0
].
baseUrl
+
"/"
JAVA_LOGIN_BASE_URL
=
it
.
baseUrlGatewayDTOList
[
0
].
baseUrl
+
"/"
urlMap
[
YDL_DOMAIN_LOGIN_BASE_URL
]
=
JAVA_LOGIN_BASE_URL
urlMap
[
YDL_DOMAIN_LOGIN_BASE_URL
]
=
JAVA_LOGIN_BASE_URL
ApiFactory
.
getInstance
().
setMultipleUrlMap
(
urlMap
)
ApiFactory
.
getInstance
().
setMultipleUrlMap
(
urlMap
)
...
...
ydl-platform/src/main/java/com/ydl/ydlcommon/data/http/api/NetApiStore.java
View file @
6d030f2f
...
@@ -52,6 +52,6 @@ interface NetApiStore {
...
@@ -52,6 +52,6 @@ interface NetApiStore {
Observable
<
BaseAPIResponse
<
JavaGlobalInfo
>>
getJavaGlobalInfo
();
Observable
<
BaseAPIResponse
<
JavaGlobalInfo
>>
getJavaGlobalInfo
();
@Headers
({
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
,
"userPort:1"
,
"Content-type:application/json;charset=UTF-8"
})
@Headers
({
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
,
"userPort:1"
,
"Content-type:application/json;charset=UTF-8"
})
@POST
(
"
ydl-yiliao-api/
api/client/login/v1/get_gateway_base_url"
)
@POST
(
"api/client/login/v1/get_gateway_base_url"
)
Observable
<
BaseAPIResponse
<
BaseUrlBean
>>
getBaseUrl
(
@Body
Map
<
String
,
Object
>
map
);
Observable
<
BaseAPIResponse
<
BaseUrlBean
>>
getBaseUrl
(
@Body
Map
<
String
,
Object
>
map
);
}
}
ydl-platform/src/main/res/raw/api.properties
View file @
6d030f2f
...
@@ -46,10 +46,10 @@ medicalh5url.auto_test = https://auto_testnewm.yidianling.cn/
...
@@ -46,10 +46,10 @@ medicalh5url.auto_test = https://auto_testnewm.yidianling.cn/
medicalh5url.prod
=
https://m.yidianling.cn/
medicalh5url.prod
=
https://m.yidianling.cn/
#java服务器域名
#java服务器域名
javaurl.new_test
=
https://ydltestapi.ydl.com/
javaurl.new_test
=
https://ydltestapi.ydl.com/
ydl-yiliao-api/
javaurl.test
=
https://testapi.ydl.com/
javaurl.test
=
https://testapi.ydl.com/
ydl-yiliao-api/
javaurl.auto_test
=
https://auto_testapi.ydl.com/
javaurl.auto_test
=
https://auto_testapi.ydl.com/
ydl-yiliao-api/
javaurl.prod
=
https://api.y
dl.com
/
javaurl.prod
=
https://api.y
idianling.cn
/
#java服务器api统一域名
#java服务器api统一域名
javaapi.new_test
=
https://ydltestapi.ydl.com/api/
javaapi.new_test
=
https://ydltestapi.ydl.com/api/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment