From 918723193054cb0379d29af01b482eb6e78b4b65 Mon Sep 17 00:00:00 2001 From: litao Date: Fri, 19 May 2017 13:16:37 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/biz/RemoteService.java | 17 ++--------------- .../src/main/resources/config.properties | 6 +----- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/RemoteService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/RemoteService.java index b543555..f4abc35 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/RemoteService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/RemoteService.java @@ -1,12 +1,9 @@ package com.lyms.platform.biz; import com.lyms.platform.common.utils.HttpClientUtil; -import com.lyms.platform.common.utils.PropertiesUtil; -import org.apache.commons.lang3.StringUtils; +import com.lyms.platform.common.utils.PropertiesUtils; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; -import java.text.MessageFormat; import java.util.HashMap; import java.util.Map; @@ -18,17 +15,7 @@ import java.util.Map; @Service public class RemoteService { - private String BASE_URL; - - public static final String INVALID_COUPON_URL = "coupon/invalid"; - - @PostConstruct - public void init() { - String type = PropertiesUtil.getInstance().get("config","remote.url.type"); - if(StringUtils.isNotBlank(type)) { - this.BASE_URL = PropertiesUtil.getInstance().get("config", MessageFormat.format("platform.operate.api.{0}.url", type)); - } - } + private String BASE_URL = PropertiesUtils.getPropertyValue("platform.operate.api.validate.url"); /** * 作废优惠券相关 diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index a64c5da..d1b0dbe 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -78,9 +78,5 @@ jdbc.7.url=jdbc:oracle:thin:@119.90.57.26:1522:orcl jdbc.7.username=LYMS_ODS jdbc.7.password=Welcome1 -# 远程调用类型 1=本地 2=测试环境 3=线上环境 -remote.url.type=2 -platform.operate.api.1.url=http://localhost:9091/ -platform.operate.api.2.url=http://localhost:8080/ -platform.operate.api.3.url=https://dev-rp.healthbaby.com.cn/ +platform.operate.api.validate.url=http://localhost:8080/ -- 1.8.3.1