feat:域名修改

app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java

@@ -20,8 +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_TEST;
-    public static String appEnv = YDLConstants.ENV_NEW_TEST;
-//    public static String appEnv = YDLConstants.ENV_PROD;
+//    public static String appEnv = YDLConstants.ENV_NEW_TEST;
+    public static String appEnv = YDLConstants.ENV_PROD;
 
     @Override
     public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) {

config.gradle

@@ -8,7 +8,7 @@ ext {
             "m-confide"       : "0.0.49.10",
             "m-consultant"    : "0.0.59.91",
             "m-fm"            : "0.0.30.03",
-            "m-user"          : "0.0.61.84",
+            "m-user"          : "0.0.61.86",
             "m-home"          : "0.0.22.70",
             "m-im"            : "0.0.20.61",
             "m-dynamic"       : "0.0.7.28",
@@ -33,7 +33,7 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.40.59",
+            "ydl-platform"    : "0.0.40.62",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.53",
@@ -92,7 +92,7 @@ ext {
             "m-confide"       : "0.0.49.10",
             "m-consultant"    : "0.0.59.91",
             "m-fm"            : "0.0.30.01",
-            "m-user"          : "0.0.61.84",
+            "m-user"          : "0.0.61.86",
             "m-home"          : "0.0.22.70",
             "m-im"            : "0.0.20.61",
             "m-dynamic"       : "0.0.7.28",
@@ -116,7 +116,7 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.40.59",
+            "ydl-platform"    : "0.0.40.61",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.53",

m-im/src/main/java/com/yidianling/im/http/ImRetrofitApi.kt

@@ -165,7 +165,7 @@ interface ImRetrofitApi {
 
     //获取医生问诊状态
     @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(
         @Query("doctorUid") doctorId: String,
         @Query("userUid") userUid: String

m-im/src/main/java/com/yidianling/uikit/custom/http/ServiceApi.kt

@@ -122,7 +122,7 @@ interface ServiceApi {
     ): 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)
     fun getPageList(
         @Query("pageNum") pageNum: Int,
@@ -130,37 +130,37 @@ interface ServiceApi {
     ): 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)
     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)
     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)
     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)
     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)
     @Multipart
     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)
     fun upload(@PartMap params: TreeMap<String, RequestBody>): Observable<BaseAPIResponse<MedicalFileBeanRespose>>
 

m-user/src/main/java/com/yidianling/user/http/UserApi.kt

@@ -29,7 +29,7 @@ interface UserApi {
     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)
     fun countryList(@Query("gatewayUrl") gatewayUrl: String): Observable<BaseResponse<List<CountryResponse>>>
 
@@ -96,7 +96,7 @@ interface UserApi {
 
     //登出
     @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>>
 
     //更换手机时密码验证
@@ -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)
     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)
     fun loginByMsgCode(@Body body: RequestBody): Observable<BaseResponse<UserResponseBean>>
 
@@ -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)
     fun checkPhoneStatus(
         @Query("phone") phone: String,
@@ -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)
     fun sendLoginMsgCode(
         @Query("phone") phone: String,

ydl-medical-pay/src/main/java/com/medical/ydl/medical/http/MedicalPayServices.kt

@@ -13,7 +13,7 @@ interface MedicalPayServices {
     /**
      * 问诊订单创建支付
      */
-    @POST("ydl-yiliao-api/api/pay/createPay")
+    @POST("api/pay/createPay")
     @Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL)
     fun getOrderInfo(@Body body: RequestBody): Observable<BaseResponse<CreatePayRespose>>
 
@@ -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)
     fun getSurplusPayTime(@Query("inquiryOrderId") inquiryOrderId: String): Observable<BaseResponse<PayTimeRespose>>
 

ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/HttpConfig.kt

@@ -534,8 +534,8 @@ class HttpConfig {
             .subscribe({
                 if (it.baseUrlGatewayDTOList.isNotEmpty()) {
                     isEncryption = it.baseUrlGatewayDTOList[0].goGateway
-                    GET_GATEWAY_BASE_URL = it.baseUrlGatewayDTOList[0].baseUrl
                     if (isEncryption) {
+                        GET_GATEWAY_BASE_URL = it.baseUrlGatewayDTOList[0].baseUrl
                         JAVA_LOGIN_BASE_URL = it.baseUrlGatewayDTOList[0].baseUrl + "/"
                         urlMap[YDL_DOMAIN_LOGIN_BASE_URL] = JAVA_LOGIN_BASE_URL
                         ApiFactory.getInstance().setMultipleUrlMap(urlMap)

ydl-platform/src/main/java/com/ydl/ydlcommon/data/http/api/NetApiStore.java

@@ -52,6 +52,6 @@ interface NetApiStore {
     Observable<BaseAPIResponse<JavaGlobalInfo>> getJavaGlobalInfo();
 
     @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);
 }

ydl-platform/src/main/res/raw/api.properties

@@ -46,10 +46,10 @@ medicalh5url.auto_test = https://auto_testnewm.yidianling.cn/
 medicalh5url.prod = https://m.yidianling.cn/
 
 #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/
+javaurl.new_test = https://ydltestapi.ydl.com/ydl-yiliao-api/
+javaurl.test = https://testapi.ydl.com/ydl-yiliao-api/
+javaurl.auto_test = https://auto_testapi.ydl.com/ydl-yiliao-api/
+javaurl.prod = https://api.yidianling.cn/
 
 #java服务器api统一域名
 javaapi.new_test = https://ydltestapi.ydl.com/api/